src/share/vm/jvmci/jvmciCodeInstaller.cpp

*** 170,180 ****
      }
    }
    return map;
  }
  
! void* CodeInstaller::record_metadata_reference(Handle constant, TRAPS) {
    /*
     * This method needs to return a raw (untyped) pointer, since the value of a pointer to the base
     * class is in general not equal to the pointer of the subclass. When patching metaspace pointers,
     * the compiler expects a direct pointer to the subclass (Klass* or Method*), not a pointer to the
     * base class (Metadata* or MetaspaceObj*).
--- 170,180 ----
      }
    }
    return map;
  }
  
! void* CodeInstaller::record_metadata_reference(CodeSection* section, address dest, Handle constant, TRAPS) {
    /*
     * This method needs to return a raw (untyped) pointer, since the value of a pointer to the base
     * class is in general not equal to the pointer of the subclass. When patching metaspace pointers,
     * the compiler expects a direct pointer to the subclass (Klass* or Method*), not a pointer to the
     * base class (Metadata* or MetaspaceObj*).
*** 182,215 ****
    oop obj = HotSpotMetaspaceConstantImpl::metaspaceObject(constant);
    if (obj->is_a(HotSpotResolvedObjectTypeImpl::klass())) {
      Klass* klass = java_lang_Class::as_Klass(HotSpotResolvedObjectTypeImpl::javaClass(obj));
      assert(!HotSpotMetaspaceConstantImpl::compressed(constant), "unexpected compressed klass pointer %s @ " INTPTR_FORMAT, klass->name()->as_C_string(), p2i(klass));
      int index = _oop_recorder->find_index(klass);
      TRACE_jvmci_3("metadata[%d of %d] = %s", index, _oop_recorder->metadata_count(), klass->name()->as_C_string());
      return klass;
    } else if (obj->is_a(HotSpotResolvedJavaMethodImpl::klass())) {
      Method* method = (Method*) (address) HotSpotResolvedJavaMethodImpl::metaspaceMethod(obj);
      assert(!HotSpotMetaspaceConstantImpl::compressed(constant), "unexpected compressed method pointer %s @ " INTPTR_FORMAT, method->name()->as_C_string(), p2i(method));
      int index = _oop_recorder->find_index(method);
      TRACE_jvmci_3("metadata[%d of %d] = %s", index, _oop_recorder->metadata_count(), method->name()->as_C_string());
      return method;
    } else {
      JVMCI_ERROR_NULL("unexpected metadata reference for constant of type %s", obj->klass()->signature_name());
    }
  }
  
  #ifdef _LP64
! narrowKlass CodeInstaller::record_narrow_metadata_reference(Handle constant, TRAPS) {
    oop obj = HotSpotMetaspaceConstantImpl::metaspaceObject(constant);
    assert(HotSpotMetaspaceConstantImpl::compressed(constant), "unexpected uncompressed pointer");
  
    if (!obj->is_a(HotSpotResolvedObjectTypeImpl::klass())) {
      JVMCI_ERROR_0("unexpected compressed pointer of type %s", obj->klass()->signature_name());
    }
  
    Klass* klass = java_lang_Class::as_Klass(HotSpotResolvedObjectTypeImpl::javaClass(obj));
    int index = _oop_recorder->find_index(klass);
    TRACE_jvmci_3("narrowKlass[%d of %d] = %s", index, _oop_recorder->metadata_count(), klass->name()->as_C_string());
    return Klass::encode_klass(klass);
  }
  #endif
  
--- 182,218 ----
    oop obj = HotSpotMetaspaceConstantImpl::metaspaceObject(constant);
    if (obj->is_a(HotSpotResolvedObjectTypeImpl::klass())) {
      Klass* klass = java_lang_Class::as_Klass(HotSpotResolvedObjectTypeImpl::javaClass(obj));
      assert(!HotSpotMetaspaceConstantImpl::compressed(constant), "unexpected compressed klass pointer %s @ " INTPTR_FORMAT, klass->name()->as_C_string(), p2i(klass));
      int index = _oop_recorder->find_index(klass);
+     section->relocate(dest, metadata_Relocation::spec(index));
      TRACE_jvmci_3("metadata[%d of %d] = %s", index, _oop_recorder->metadata_count(), klass->name()->as_C_string());
      return klass;
    } else if (obj->is_a(HotSpotResolvedJavaMethodImpl::klass())) {
      Method* method = (Method*) (address) HotSpotResolvedJavaMethodImpl::metaspaceMethod(obj);
      assert(!HotSpotMetaspaceConstantImpl::compressed(constant), "unexpected compressed method pointer %s @ " INTPTR_FORMAT, method->name()->as_C_string(), p2i(method));
      int index = _oop_recorder->find_index(method);
+     section->relocate(dest, metadata_Relocation::spec(index));
      TRACE_jvmci_3("metadata[%d of %d] = %s", index, _oop_recorder->metadata_count(), method->name()->as_C_string());
      return method;
    } else {
      JVMCI_ERROR_NULL("unexpected metadata reference for constant of type %s", obj->klass()->signature_name());
    }
  }
  
  #ifdef _LP64
! narrowKlass CodeInstaller::record_narrow_metadata_reference(CodeSection* section, address dest, Handle constant, TRAPS) {
    oop obj = HotSpotMetaspaceConstantImpl::metaspaceObject(constant);
    assert(HotSpotMetaspaceConstantImpl::compressed(constant), "unexpected uncompressed pointer");
  
    if (!obj->is_a(HotSpotResolvedObjectTypeImpl::klass())) {
      JVMCI_ERROR_0("unexpected compressed pointer of type %s", obj->klass()->signature_name());
    }
  
    Klass* klass = java_lang_Class::as_Klass(HotSpotResolvedObjectTypeImpl::javaClass(obj));
    int index = _oop_recorder->find_index(klass);
+   section->relocate(dest, metadata_Relocation::spec(index));
    TRACE_jvmci_3("narrowKlass[%d of %d] = %s", index, _oop_recorder->metadata_count(), klass->name()->as_C_string());
    return Klass::encode_klass(klass);
  }
  #endif
  
*** 699,714 ****
      }
      address dest = _constants->start() + site_Site::pcOffset(patch);
      if (constant->is_a(HotSpotMetaspaceConstantImpl::klass())) {
        if (HotSpotMetaspaceConstantImpl::compressed(constant)) {
  #ifdef _LP64
!         *((narrowKlass*) dest) = record_narrow_metadata_reference(constant, CHECK_OK);
  #else
          JVMCI_ERROR_OK("unexpected compressed Klass* in 32-bit mode");
  #endif
        } else {
!         *((void**) dest) = record_metadata_reference(constant, CHECK_OK);
        }
      } else if (constant->is_a(HotSpotObjectConstantImpl::klass())) {
        Handle obj = HotSpotObjectConstantImpl::object(constant);
        jobject value = JNIHandles::make_local(obj());
        int oop_index = _oop_recorder->find_index(value);
--- 702,717 ----
      }
      address dest = _constants->start() + site_Site::pcOffset(patch);
      if (constant->is_a(HotSpotMetaspaceConstantImpl::klass())) {
        if (HotSpotMetaspaceConstantImpl::compressed(constant)) {
  #ifdef _LP64
!         *((narrowKlass*) dest) = record_narrow_metadata_reference(_constants, dest, constant, CHECK_OK);
  #else
          JVMCI_ERROR_OK("unexpected compressed Klass* in 32-bit mode");
  #endif
        } else {
!         *((void**) dest) = record_metadata_reference(_constants, dest, constant, CHECK_OK);
        }
      } else if (constant->is_a(HotSpotObjectConstantImpl::klass())) {
        Handle obj = HotSpotObjectConstantImpl::object(constant);
        jobject value = JNIHandles::make_local(obj());
        int oop_index = _oop_recorder->find_index(value);