--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp	Fri Jul 10 16:01:20 2009 -0700
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp	Tue Jul 14 15:40:39 2009 -0700
@@ -119,6 +119,7 @@
     assert(false, "should be optimized out");
     return;
   }
+  assert(orig->is_oop(true /* ignore mark word */), "Error");
   // store the original value that was in the field reference
   thread->satb_mark_queue().enqueue(orig);
 JRT_END