--- a/anonk.patch Thu Apr 17 00:39:29 2008 -0700
+++ b/anonk.patch Thu Apr 24 14:31:28 2008 -0700
@@ -41,7 +41,7 @@ diff --git a/src/share/vm/classfile/clas
class_index, CHECK_(nullHandle));
- cp->unresolved_klass_at_put(index, cp->symbol_at(class_index));
+ symbolOop name = cp->symbol_at(class_index);
-+ klassOop wkk = SystemDictionary::find_well_known_klass(name);
++ klassOop wkk = NULL; //%%% S.B. SystemDictionary::find_well_known_klass(name);
+ if (wkk != NULL) {
+ cp->klass_at_put(index, wkk); // eagerly resolve
+ } else {
@@ -107,7 +107,7 @@ diff --git a/src/share/vm/classfile/clas
+ case JVM_CONSTANT_UnresolvedClass :
+ // Patching a class means pre-resolving it.
+ // The name in the constant pool is ignored.
-+ if (java_lang_Class::is_instance(patch())) {
++ if (patch->klass() == SystemDictionary::class_klass()) { // %%% java_lang_Class::is_instance
+ guarantee_property(!java_lang_Class::is_primitive(patch()),
+ "Illegal class patch at %d in class file %s",
+ index, CHECK);
@@ -157,7 +157,7 @@ diff --git a/src/share/vm/classfile/clas
+ "Illegal unexpected patch at %d in class file %s",
+ index, CHECK);
+ return;
-+ }
++ }
+
+ // On fall-through, mark the patch as used.
+ clear_cp_patch_at(index);
--- a/callcc.patch Thu Apr 17 00:39:29 2008 -0700
+++ b/callcc.patch Thu Apr 24 14:31:28 2008 -0700
@@ -18,27 +18,6 @@ diff --git a/src/cpu/x86/vm/sharedRuntim
// Load UnrollBlock* into rdi
__ movq(rdi, rax);
-diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp
---- a/src/share/vm/classfile/classFileParser.cpp
-+++ b/src/share/vm/classfile/classFileParser.cpp
-@@ -313,7 +313,7 @@ constantPoolHandle ClassFileParser::pars
- "Invalid constant pool index %u in class file %s",
- class_index, CHECK_(nullHandle));
- symbolOop name = cp->symbol_at(class_index);
-- klassOop wkk = SystemDictionary::find_well_known_klass(name);
-+ klassOop wkk = NULL; //%%% S.B. SystemDictionary::find_well_known_klass(name);
- if (wkk != NULL) {
- cp->klass_at_put(index, wkk); // eagerly resolve
- } else {
-@@ -431,7 +431,7 @@ void ClassFileParser::patch_constant_poo
- case JVM_CONSTANT_UnresolvedClass :
- // Patching a class means pre-resolving it.
- // The name in the constant pool is ignored.
-- if (java_lang_Class::is_instance(patch())) {
-+ if (patch->klass() == SystemDictionary::class_klass()) { // %%% java_lang_Class::is_instance
- guarantee_property(!java_lang_Class::is_primitive(patch()),
- "Illegal class patch at %d in class file %s",
- index, CHECK);
diff --git a/src/share/vm/includeDB_core b/src/share/vm/includeDB_core
--- a/src/share/vm/includeDB_core
+++ b/src/share/vm/includeDB_core