src/share/vm/runtime/os.cpp

rev 12854 : [mq]: gcinterface.patch

*** 978,993 ****
      st->print_cr(INTPTR_FORMAT " is at code_begin+%d in ", p2i(addr), (int)(addr - b->code_begin()));
      b->print_on(st);
      return;
    }
  
!   if (Universe::heap()->is_in(addr)) {
!     HeapWord* p = Universe::heap()->block_start(addr);
      bool print = false;
      // If we couldn't find it it just may mean that heap wasn't parsable
      // See if we were just given an oop directly
!     if (p != NULL && Universe::heap()->block_is_obj(p)) {
        print = true;
      } else if (p == NULL && ((oopDesc*)addr)->is_oop()) {
        p = (HeapWord*) addr;
        print = true;
      }
--- 978,993 ----
      st->print_cr(INTPTR_FORMAT " is at code_begin+%d in ", p2i(addr), (int)(addr - b->code_begin()));
      b->print_on(st);
      return;
    }
  
!   if (GC::gc()->heap()->is_in(addr)) {
!     HeapWord* p = GC::gc()->heap()->block_start(addr);
      bool print = false;
      // If we couldn't find it it just may mean that heap wasn't parsable
      // See if we were just given an oop directly
!     if (p != NULL && GC::gc()->heap()->block_is_obj(p)) {
        print = true;
      } else if (p == NULL && ((oopDesc*)addr)->is_oop()) {
        p = (HeapWord*) addr;
        print = true;
      }
*** 999,1009 ****
        }
        oop(p)->print_on(st);
        return;
      }
    } else {
!     if (Universe::heap()->is_in_reserved(addr)) {
        st->print_cr(INTPTR_FORMAT " is an unallocated location "
                     "in the heap", p2i(addr));
        return;
      }
    }
--- 999,1009 ----
        }
        oop(p)->print_on(st);
        return;
      }
    } else {
!     if (GC::gc()->heap()->is_in_reserved(addr)) {
        st->print_cr(INTPTR_FORMAT " is an unallocated location "
                     "in the heap", p2i(addr));
        return;
      }
    }