src/share/vm/code/nmethod.cpp

rev 10700 : [backport] Trim down oop-equals verification

@@ -1869,11 +1869,11 @@
   }
 
 
   // Scopes
   for (oop* p = oops_begin(); p < oops_end(); p++) {
-    if (oopDesc::unsafe_equals(*p, (oop) Universe::non_oop_word()))  continue;  // skip non-oops
+    if (*p == Universe::non_oop_word())  continue;  // skip non-oops
     if (can_unload(is_alive, p, unloading_occurred)) {
       return;
     }
   }
 

@@ -2042,11 +2042,11 @@
     return postponed;
   }
 
   // Scopes
   for (oop* p = oops_begin(); p < oops_end(); p++) {
-    if (oopDesc::unsafe_equals(*p, (oop) Universe::non_oop_word()))  continue;  // skip non-oops
+    if (*p == Universe::non_oop_word())  continue;  // skip non-oops
     if (can_unload(is_alive, p, unloading_occurred)) {
       is_unloaded = true;
       break;
     }
   }

@@ -2256,11 +2256,11 @@
   }
 
   // Scopes
   // This includes oop constants not inlined in the code stream.
   for (oop* p = oops_begin(); p < oops_end(); p++) {
-    if (oopDesc::unsafe_equals(*p, (oop) Universe::non_oop_word()))  continue;  // skip non-oops
+    if (*p == Universe::non_oop_word())  continue;  // skip non-oops
     f->do_oop(p);
   }
 }
 
 #define NMETHOD_SENTINEL ((nmethod*)badAddress)