--- a/hotspot/src/share/vm/opto/lcm.cpp Thu Jun 05 15:57:56 2008 -0700
+++ b/hotspot/src/share/vm/opto/lcm.cpp Thu Jun 12 13:50:55 2008 -0700
@@ -113,6 +113,7 @@
case Op_LoadN:
case Op_LoadS:
case Op_LoadKlass:
+ case Op_LoadNKlass:
case Op_LoadRange:
case Op_LoadD_unaligned:
case Op_LoadL_unaligned:
@@ -133,6 +134,7 @@
if( mach->in(2) != val ) continue;
break; // Found a memory op?
case Op_StrComp:
+ case Op_AryEq:
// Not a legit memory op for implicit null check regardless of
// embedded loads
continue;