--- a/anonk.patch	Tue Jul 15 00:12:32 2008 -0700
+++ b/anonk.patch	Tue Jul 15 00:43:53 2008 -0700
@@ -495,13 +495,12 @@ diff --git a/src/share/vm/oops/constantP
    oop entry = *(this_oop->obj_at_addr(which));
    if (entry->is_symbol()) {
      ObjectLocker ol(this_oop, THREAD);
-@@ -380,8 +383,22 @@ oop constantPoolOopDesc::string_at_impl(
+@@ -380,8 +383,21 @@ oop constantPoolOopDesc::string_at_impl(
        entry = this_oop->resolved_string_at(which);
      }
    }
 -  assert(java_lang_String::is_instance(entry), "must be string");
-+  if (!pseudo_ok)
-+    assert(java_lang_String::is_instance(entry), "must be string");
++  assert(pseudo_ok || java_lang_String::is_instance(entry), "must be string");
    return entry;
 +}
 +
@@ -636,7 +635,7 @@ diff --git a/src/share/vm/oops/instanceK
    }
  
 +  oop* hk_addr = ik->adr_host_klass();
-+  if (PSScavenge::should_scavenge(*hk_addr)) {
++  if (PSScavenge::should_scavenge(hk_addr)) {
 +    pm->claim_or_forward_breadth(hk_addr);
 +  }
 +
@@ -650,7 +649,7 @@ diff --git a/src/share/vm/oops/instanceK
 +  }
 +
 +  oop* hk_addr = ik->adr_host_klass();
-+  if (PSScavenge::should_scavenge(*hk_addr)) {
++  if (PSScavenge::should_scavenge(hk_addr)) {
 +    pm->claim_or_forward_depth(hk_addr);
    }
  

--- a/callcc.patch	Tue Jul 15 00:12:32 2008 -0700
+++ b/callcc.patch	Tue Jul 15 00:43:53 2008 -0700
@@ -446,27 +446,6 @@ diff --git a/src/share/vm/includeDB_core
  vframeArray.cpp                         events.hpp
  vframeArray.cpp                         handles.inline.hpp
  vframeArray.cpp                         interpreter.hpp
-diff --git a/src/share/vm/oops/instanceKlassKlass.cpp b/src/share/vm/oops/instanceKlassKlass.cpp
---- a/src/share/vm/oops/instanceKlassKlass.cpp
-+++ b/src/share/vm/oops/instanceKlassKlass.cpp
-@@ -302,7 +302,7 @@ void instanceKlassKlass::oop_copy_conten
-   }
- 
-   oop* hk_addr = ik->adr_host_klass();
--  if (PSScavenge::should_scavenge(*hk_addr)) {
-+  if (PSScavenge::should_scavenge(hk_addr)) {
-     pm->claim_or_forward_breadth(hk_addr);
-   }
- 
-@@ -330,7 +330,7 @@ void instanceKlassKlass::oop_push_conten
-   }
- 
-   oop* hk_addr = ik->adr_host_klass();
--  if (PSScavenge::should_scavenge(*hk_addr)) {
-+  if (PSScavenge::should_scavenge(hk_addr)) {
-     pm->claim_or_forward_depth(hk_addr);
-   }
- 
 diff --git a/src/share/vm/oops/methodOop.cpp b/src/share/vm/oops/methodOop.cpp
 --- a/src/share/vm/oops/methodOop.cpp
 +++ b/src/share/vm/oops/methodOop.cpp