src/hotspot/share/ci/ciObjectFactory.cpp

rev 49250 : [mq]: JDK-8199781.patch

*** 246,256 ****
  
    // The ciObject does not yet exist.  Create it and insert it
    // into the cache.
    Handle keyHandle(Thread::current(), key);
    ciObject* new_object = create_new_object(keyHandle());
!   assert(keyHandle() == new_object->get_oop(), "must be properly recorded");
    init_ident_of(new_object);
    assert(Universe::heap()->is_in_reserved(new_object->get_oop()), "must be");
  
    // Not a perm-space object.
    insert_non_perm(bucket, keyHandle(), new_object);
--- 246,256 ----
  
    // The ciObject does not yet exist.  Create it and insert it
    // into the cache.
    Handle keyHandle(Thread::current(), key);
    ciObject* new_object = create_new_object(keyHandle());
!   assert(oopDesc::equals(keyHandle(), new_object->get_oop()), "must be properly recorded");
    init_ident_of(new_object);
    assert(Universe::heap()->is_in_reserved(new_object->get_oop()), "must be");
  
    // Not a perm-space object.
    insert_non_perm(bucket, keyHandle(), new_object);
*** 447,458 ****
      domain = accessing_klass->protection_domain();
    }
    for (int i=0; i<_unloaded_klasses->length(); i++) {
      ciKlass* entry = _unloaded_klasses->at(i);
      if (entry->name()->equals(name) &&
!         entry->loader() == loader &&
!         entry->protection_domain() == domain) {
        // We've found a match.
        return entry;
      }
    }
  
--- 447,458 ----
      domain = accessing_klass->protection_domain();
    }
    for (int i=0; i<_unloaded_klasses->length(); i++) {
      ciKlass* entry = _unloaded_klasses->at(i);
      if (entry->name()->equals(name) &&
!         oopDesc::equals(entry->loader(), loader) &&
!         oopDesc::equals(entry->protection_domain(), domain)) {
        // We've found a match.
        return entry;
      }
    }