src/hotspot/share/classfile/classLoaderData.cpp

*** 199,209 ****
  
   public:
    VerifyContainsOopClosure(oop target) : _target(target), _found(false) {}
  
    void do_oop(oop* p) {
!     if (p != NULL && *p == _target) {
        _found = true;
      }
    }
  
    void do_oop(narrowOop* p) {
--- 199,209 ----
  
   public:
    VerifyContainsOopClosure(oop target) : _target(target), _found(false) {}
  
    void do_oop(oop* p) {
!     if (p != NULL && oopDesc::equals(oopDesc::load_heap_oop(p), _target)) {
        _found = true;
      }
    }
  
    void do_oop(narrowOop* p) {
*** 378,388 ****
      to = to_cld->class_loader();
      oop from = from_cld->class_loader();
  
      // Just return if this dependency is to a class with the same or a parent
      // class_loader.
!     if (from == to || java_lang_ClassLoader::isAncestor(from, to)) {
        return; // this class loader is in the parent list, no need to add it.
      }
    }
  
    // It's a dependency we won't find through GC, add it.
--- 378,388 ----
      to = to_cld->class_loader();
      oop from = from_cld->class_loader();
  
      // Just return if this dependency is to a class with the same or a parent
      // class_loader.
!     if (oopDesc::equals(from, to) || java_lang_ClassLoader::isAncestor(from, to)) {
        return; // this class loader is in the parent list, no need to add it.
      }
    }
  
    // It's a dependency we won't find through GC, add it.