src/share/vm/gc/g1/heapRegion.cpp

*** 608,618 ****
              p2i(p), p2i(_containing_obj), HR_FORMAT_PARAMS(from));
            ResourceMark rm;
            LogStream ls(log.error());
            _containing_obj->print_on(&ls);
            log.error("points to obj " PTR_FORMAT " in region " HR_FORMAT, p2i(obj), HR_FORMAT_PARAMS(to));
!           if (obj->is_oop()) {
              obj->print_on(&ls);
            }
            log.error("Obj head CTE = %d, field CTE = %d.", cv_obj, cv_field);
            log.error("----------");
            _failures = true;
--- 608,618 ----
              p2i(p), p2i(_containing_obj), HR_FORMAT_PARAMS(from));
            ResourceMark rm;
            LogStream ls(log.error());
            _containing_obj->print_on(&ls);
            log.error("points to obj " PTR_FORMAT " in region " HR_FORMAT, p2i(obj), HR_FORMAT_PARAMS(to));
!           if (oopDesc::is_oop(obj)) {
              obj->print_on(&ls);
            }
            log.error("Obj head CTE = %d, field CTE = %d.", cv_obj, cv_field);
            log.error("----------");
            _failures = true;
*** 655,665 ****
      oop obj = oop(p);
      size_t obj_size = block_size(p);
      object_num += 1;
  
      if (!g1->is_obj_dead_cond(obj, this, vo)) {
!       if (obj->is_oop()) {
          Klass* klass = obj->klass();
          bool is_metaspace_object = Metaspace::contains(klass) ||
                                     (vo == VerifyOption_G1UsePrevMarking &&
                                     ClassLoaderDataGraph::unload_list_contains(klass));
          if (!is_metaspace_object) {
--- 655,665 ----
      oop obj = oop(p);
      size_t obj_size = block_size(p);
      object_num += 1;
  
      if (!g1->is_obj_dead_cond(obj, this, vo)) {
!       if (oopDesc::is_oop(obj)) {
          Klass* klass = obj->klass();
          bool is_metaspace_object = Metaspace::contains(klass) ||
                                     (vo == VerifyOption_G1UsePrevMarking &&
                                     ClassLoaderDataGraph::unload_list_contains(klass));
          if (!is_metaspace_object) {
*** 801,811 ****
    while (p < top()) {
      oop obj = oop(p);
      size_t obj_size = block_size(p);
  
      if (!g1->is_obj_dead_cond(obj, this, vo)) {
!       if (obj->is_oop()) {
          vr_cl.set_containing_obj(obj);
          obj->oop_iterate_no_header(&vr_cl);
  
          if (vr_cl.failures()) {
            *failures = true;
--- 801,811 ----
    while (p < top()) {
      oop obj = oop(p);
      size_t obj_size = block_size(p);
  
      if (!g1->is_obj_dead_cond(obj, this, vo)) {
!       if (oopDesc::is_oop(obj)) {
          vr_cl.set_containing_obj(obj);
          obj->oop_iterate_no_header(&vr_cl);
  
          if (vr_cl.failures()) {
            *failures = true;