--- a/hotspot/src/share/vm/opto/library_call.cpp	Fri Apr 08 14:53:16 2011 -0700
+++ b/hotspot/src/share/vm/opto/library_call.cpp	Wed Apr 13 17:56:43 2011 -0700
@@ -2169,7 +2169,7 @@
   const int reference_type_offset = instanceKlass::reference_type_offset_in_bytes() +
                                         sizeof(oopDesc);
 
-  Node* referent_off = __ ConI(java_lang_ref_Reference::referent_offset);
+  Node* referent_off = __ ConX(java_lang_ref_Reference::referent_offset);
 
   __ if_then(offset, BoolTest::eq, referent_off, unlikely); {
     __ if_then(base_oop, BoolTest::ne, null(), likely); {