src/share/vm/gc/shared/space.cpp

*** 489,499 ****
                                                                              \
    void ContiguousSpace::par_oop_iterate(MemRegion mr, OopClosureType* blk) {\
      HeapWord* obj_addr = mr.start();                                        \
      HeapWord* t = mr.end();                                                 \
      while (obj_addr < t) {                                                  \
!       assert(oop(obj_addr)->is_oop(), "Should be an oop");                  \
        obj_addr += oop(obj_addr)->oop_iterate_size(blk);                     \
      }                                                                       \
    }
  
    ALL_PAR_OOP_ITERATE_CLOSURES(ContigSpace_PAR_OOP_ITERATE_DEFN)
--- 489,499 ----
                                                                              \
    void ContiguousSpace::par_oop_iterate(MemRegion mr, OopClosureType* blk) {\
      HeapWord* obj_addr = mr.start();                                        \
      HeapWord* t = mr.end();                                                 \
      while (obj_addr < t) {                                                  \
!       assert(oopDesc::is_oop(oop(obj_addr)), "Should be an oop");           \
        obj_addr += oop(obj_addr)->oop_iterate_size(blk);                     \
      }                                                                       \
    }
  
    ALL_PAR_OOP_ITERATE_CLOSURES(ContigSpace_PAR_OOP_ITERATE_DEFN)
*** 582,592 ****
      HeapWord* cur = last;
      while (cur <= p) {
        last = cur;
        cur += oop(cur)->size();
      }
!     assert(oop(last)->is_oop(), PTR_FORMAT " should be an object start", p2i(last));
      return last;
    }
  }
  
  size_t ContiguousSpace::block_size(const HeapWord* p) const {
--- 582,592 ----
      HeapWord* cur = last;
      while (cur <= p) {
        last = cur;
        cur += oop(cur)->size();
      }
!     assert(oopDesc::is_oop(oop(last)), PTR_FORMAT " should be an object start", p2i(last));
      return last;
    }
  }
  
  size_t ContiguousSpace::block_size(const HeapWord* p) const {
*** 595,608 ****
           p2i(p), p2i(bottom()), p2i(end()));
    HeapWord* current_top = top();
    assert(p <= current_top,
           "p > current top - p: " PTR_FORMAT ", current top: " PTR_FORMAT,
           p2i(p), p2i(current_top));
!   assert(p == current_top || oop(p)->is_oop(),
           "p (" PTR_FORMAT ") is not a block start - "
           "current_top: " PTR_FORMAT ", is_oop: %s",
!          p2i(p), p2i(current_top), BOOL_TO_STR(oop(p)->is_oop()));
    if (p < current_top) {
      return oop(p)->size();
    } else {
      assert(p == current_top, "just checking");
      return pointer_delta(end(), (HeapWord*) p);
--- 595,608 ----
           p2i(p), p2i(bottom()), p2i(end()));
    HeapWord* current_top = top();
    assert(p <= current_top,
           "p > current top - p: " PTR_FORMAT ", current top: " PTR_FORMAT,
           p2i(p), p2i(current_top));
!   assert(p == current_top || oopDesc::is_oop(oop(p)),
           "p (" PTR_FORMAT ") is not a block start - "
           "current_top: " PTR_FORMAT ", is_oop: %s",
!          p2i(p), p2i(current_top), BOOL_TO_STR(oopDesc::is_oop(oop(p))));
    if (p < current_top) {
      return oop(p)->size();
    } else {
      assert(p == current_top, "just checking");
      return pointer_delta(end(), (HeapWord*) p);