src/share/vm/oops/oopsHierarchy.hpp

rev 10700 : [backport] Trim down oop-equals verification
rev 10778 : [backport] Rename VerifyObjectEquals to ShenandoahVerifyObjectEquals

@@ -102,40 +102,26 @@
 
   // General access
   oopDesc*  operator->() const        { return obj(); }
   bool operator==(const oop o) const  {
 #if INCLUDE_ALL_GCS
-    if (VerifyStrictOopOperations) {
+    if (ShenandoahVerifyObjectEquals) {
       ShouldNotReachHere();
     }
 #endif
     return obj() == o.obj();
   }
-  bool operator==(void *p) const      {
-#if INCLUDE_ALL_GCS
-    if (p != NULL && VerifyStrictOopOperations) {
-      ShouldNotReachHere();
-    }
-#endif
-    return obj() == p;
-  }
+  bool operator==(void *p) const      { return obj() == p; }
   bool operator!=(const volatile oop o) const  {
 #if INCLUDE_ALL_GCS
-    if (VerifyStrictOopOperations) {
+    if (ShenandoahVerifyObjectEquals) {
       ShouldNotReachHere();
     }
 #endif
     return obj() != o.obj();
   }
-  bool operator!=(void *p) const      {
-#if INCLUDE_ALL_GCS
-    if (p != NULL && VerifyStrictOopOperations) {
-      ShouldNotReachHere();
-    }
-#endif
-    return obj() != p;
-  }
+  bool operator!=(void *p) const      { return obj() != p; }
 
   bool operator<(oop o) const         { return obj() < o.obj(); }
   bool operator>(oop o) const         { return obj() > o.obj(); }
   bool operator<=(oop o) const        { return obj() <= o.obj(); }
   bool operator>=(oop o) const        { return obj() >= o.obj(); }