src/hotspot/share/ci/ciEnv.cpp

roman_version

*** 539,549 ****
                                          get_symbol(klass_name),
                                          false);
      // Calculate accessibility the hard way.
      if (!k->is_loaded()) {
        is_accessible = false;
!     } else if (k->loader() != accessor->loader() &&
                 get_klass_by_name_impl(accessor, cpool, k->name(), true) == NULL) {
        // Loaded only remotely.  Not linked yet.
        is_accessible = false;
      } else {
        // Linked locally, and we must also check public/private, etc.
--- 539,549 ----
                                          get_symbol(klass_name),
                                          false);
      // Calculate accessibility the hard way.
      if (!k->is_loaded()) {
        is_accessible = false;
!     } else if (!oopDesc::equals(k->loader(), accessor->loader()) &&
                 get_klass_by_name_impl(accessor, cpool, k->name(), true) == NULL) {
        // Loaded only remotely.  Not linked yet.
        is_accessible = false;
      } else {
        // Linked locally, and we must also check public/private, etc.
***************
*** 590,600 ****
    if (cache_index >= 0) {
      assert(index < 0, "only one kind of index at a time");
      index = cpool->object_to_cp_index(cache_index);
      oop obj = cpool->resolved_references()->obj_at(cache_index);
      if (obj != NULL) {
!       if (obj == Universe::the_null_sentinel()) {
          return ciConstant(T_OBJECT, get_object(NULL));
        }
        BasicType bt = T_OBJECT;
        if (cpool->tag_at(index).is_dynamic_constant())
          bt = FieldType::basic_type(cpool->uncached_signature_ref_at(index));
--- 590,600 ----
    if (cache_index >= 0) {
      assert(index < 0, "only one kind of index at a time");
      index = cpool->object_to_cp_index(cache_index);
      oop obj = cpool->resolved_references()->obj_at(cache_index);
      if (obj != NULL) {
!       if (oopDesc::equals(obj, Universe::the_null_sentinel())) {
          return ciConstant(T_OBJECT, get_object(NULL));
        }
        BasicType bt = T_OBJECT;
        if (cpool->tag_at(index).is_dynamic_constant())
          bt = FieldType::basic_type(cpool->uncached_signature_ref_at(index));