src/hotspot/share/code/nmethod.cpp

*** 1680,1690 ****
  public:
    DetectScavengeRoot() : _detected_scavenge_root(false)
    { NOT_PRODUCT(_print_nm = NULL); }
    bool detected_scavenge_root() { return _detected_scavenge_root; }
    virtual void do_oop(oop* p) {
!     if ((*p) != NULL && (*p)->is_scavengable()) {
        NOT_PRODUCT(maybe_print(p));
        _detected_scavenge_root = true;
      }
    }
    virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
--- 1680,1690 ----
  public:
    DetectScavengeRoot() : _detected_scavenge_root(false)
    { NOT_PRODUCT(_print_nm = NULL); }
    bool detected_scavenge_root() { return _detected_scavenge_root; }
    virtual void do_oop(oop* p) {
!     if ((*p) != NULL && Universe::heap()->is_scavengable(*p)) {
        NOT_PRODUCT(maybe_print(p));
        _detected_scavenge_root = true;
      }
    }
    virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
*** 2175,2185 ****
    bool     _ok;
  public:
    DebugScavengeRoot(nmethod* nm) : _nm(nm), _ok(true) { }
    bool ok() { return _ok; }
    virtual void do_oop(oop* p) {
!     if ((*p) == NULL || !(*p)->is_scavengable())  return;
      if (_ok) {
        _nm->print_nmethod(true);
        _ok = false;
      }
      tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
--- 2175,2185 ----
    bool     _ok;
  public:
    DebugScavengeRoot(nmethod* nm) : _nm(nm), _ok(true) { }
    bool ok() { return _ok; }
    virtual void do_oop(oop* p) {
!     if ((*p) == NULL || !Universe::heap()->is_scavengable(*p))  return;
      if (_ok) {
        _nm->print_nmethod(true);
        _ok = false;
      }
      tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",