src/share/vm/gc/cms/promotionInfo.cpp

@@ -41,11 +41,11 @@
     // The next pointer is a compressed oop stored in the top 32 bits
     res = (PromotedObject*)oopDesc::decode_heap_oop(_data._narrow_next);
   } else {
     res = (PromotedObject*)(_next & next_mask);
   }
-  assert(oop(res)->is_oop_or_null(true /* ignore mark word */), "Expected an oop or NULL at " PTR_FORMAT, p2i(oop(res)));
+  assert(oopDesc::is_oop_or_null(oop(res), true /* ignore mark word */), "Expected an oop or NULL at " PTR_FORMAT, p2i(oop(res)));
   return res;
 }
 
 inline void PromotedObject::setNext(PromotedObject* x) {
   assert(((intptr_t)x & ~next_mask) == 0, "Conflict in bit usage, "

@@ -297,11 +297,11 @@
   // count the number of objects with displaced headers
   size_t numObjsWithDisplacedHdrs = 0;
   for (PromotedObject* curObj = _promoHead; curObj != NULL; curObj = curObj->next()) {
     guarantee(space()->is_in_reserved((HeapWord*)curObj), "Containment");
     // the last promoted object may fail the mark() != NULL test of is_oop().
-    guarantee(curObj->next() == NULL || oop(curObj)->is_oop(), "must be an oop");
+    guarantee(curObj->next() == NULL || oopDesc::is_oop(oop(curObj)), "must be an oop");
     if (curObj->hasDisplacedMark()) {
       numObjsWithDisplacedHdrs++;
     }
   }
   // Count the number of displaced headers