[GR-69676] Backport JVMCI changes to labsjdk25.

PullRequest: labsjdk-ce/206

Author: dougxc

src/hotspot/share/code/nmethod.cpp

@@ -1942,6 +1942,11 @@ bool nmethod::is_maybe_on_stack() {
 void nmethod::inc_decompile_count() {
  if (!is_compiled_by_c2() && !is_compiled_by_jvmci()) return;
  // Could be gated by ProfileTraps, but do not bother...
+#if INCLUDE_JVMCI
+ if (jvmci_skip_profile_deopt()) {
+ return;
+ }
+#endif
  Method* m = method();
  if (m == nullptr) return;
  MethodData* mdo = m->method_data();
@@ -4064,4 +4069,8 @@ const char* nmethod::jvmci_name() {
  }
  return nullptr;
 }
+
+bool nmethod::jvmci_skip_profile_deopt() const {
+ return jvmci_nmethod_data() != nullptr && !jvmci_nmethod_data()->profile_deopt();
+}
 #endif

src/hotspot/share/code/nmethod.hpp

@@ -837,6 +837,10 @@ class nmethod : public CodeBlob {
  JVMCINMethodData* jvmci_nmethod_data() const {
  return jvmci_data_size() == 0 ? nullptr : (JVMCINMethodData*) jvmci_data_begin();
  }
+
+ // Returns true if the runtime should NOT collect deoptimization profile for a JVMCI
+ // compiled method
+ bool jvmci_skip_profile_deopt() const;
 #endif
 
  void oops_do(OopClosure* f) { oops_do(f, false); }

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

@@ -2263,7 +2263,7 @@ C2V_VMENTRY_NULL(jobjectArray, getDeclaredFieldsInfo, (JNIEnv* env, jobject, ARG
  InstanceKlass* iklass = InstanceKlass::cast(klass);
  int java_fields, injected_fields;
  GrowableArray<FieldInfo>* fields = FieldInfoStream::create_FieldInfoArray(iklass->fieldinfo_stream(), &java_fields, &injected_fields);
- JVMCIObjectArray array = JVMCIENV->new_FieldInfo_array(fields->length(), JVMCIENV);
+ JVMCIObjectArray array = JVMCIENV->new_FieldInfo_array(fields->length(), JVMCI_CHECK_NULL);
  for (int i = 0; i < fields->length(); i++) {
  JVMCIObject field_info = JVMCIENV->new_FieldInfo(fields->adr_at(i), JVMCI_CHECK_NULL);
  JVMCIENV->put_object_at(array, i, field_info);
@@ -2876,11 +2876,12 @@ C2V_VMENTRY_0(jlong, translate, (JNIEnv* env, jobject, jobject obj_handle, jbool
  JVMCIObject methodObject = thisEnv->get_HotSpotNmethod_method(obj);
  methodHandle mh(THREAD, thisEnv->asMethod(methodObject));
  jboolean isDefault = thisEnv->get_HotSpotNmethod_isDefault(obj);
+ jboolean profileDeopt = thisEnv->get_HotSpotNmethod_profileDeopt(obj);
  jlong compileIdSnapshot = thisEnv->get_HotSpotNmethod_compileIdSnapshot(obj);
  JVMCIObject name_string = thisEnv->get_InstalledCode_name(obj);
  const char* cstring = name_string.is_null() ? nullptr : thisEnv->as_utf8_string(name_string);
  // Create a new HotSpotNmethod instance in the peer runtime
- result = PEER_JVMCIENV->new_HotSpotNmethod(mh, cstring, isDefault, compileIdSnapshot, JVMCI_CHECK_0);
+ result = PEER_JVMCIENV->new_HotSpotNmethod(mh, cstring, isDefault, profileDeopt, compileIdSnapshot, JVMCI_CHECK_0);
  JVMCINMethodHandle nmethod_handle(THREAD);
  nmethod* nm = JVMCIENV->get_nmethod(obj, nmethod_handle);
  if (result.is_null()) {
@@ -2969,13 +2970,21 @@ C2V_VMENTRY_NULL(jobject, asReflectionExecutable, (JNIEnv* env, jobject, ARGUMEN
  return JNIHandles::make_local(THREAD, executable);
 C2V_END
 
+// Checks that `index` denotes a non-injected field in `klass`
 static InstanceKlass* check_field(Klass* klass, jint index, JVMCI_TRAPS) {
  if (!klass->is_instance_klass()) {
  JVMCI_THROW_MSG_NULL(IllegalArgumentException,
  err_msg("Expected non-primitive type, got %s", klass->external_name()));
  }
  InstanceKlass* iklass = InstanceKlass::cast(klass);
- if (index < 0 || index > iklass->total_fields_count()) {
+ if (index < 0 || index >= iklass->java_fields_count()) {
+ if (index >= 0 && index < iklass->total_fields_count()) {
+ fieldDescriptor fd(iklass, index);
+ if (fd.is_injected()) {
+ JVMCI_THROW_MSG_NULL(IllegalArgumentException,
+ err_msg("Cannot get Field for injected %s.%s", klass->external_name(), fd.name()->as_C_string()));
+ }
+ }
  JVMCI_THROW_MSG_NULL(IllegalArgumentException,
  err_msg("Field index %d out of bounds for %s", index, klass->external_name()));
  }
@@ -2985,15 +2994,15 @@ static InstanceKlass* check_field(Klass* klass, jint index, JVMCI_TRAPS) {
 C2V_VMENTRY_NULL(jobject, asReflectionField, (JNIEnv* env, jobject, ARGUMENT_PAIR(klass), jint index))
  requireInHotSpot("asReflectionField", JVMCI_CHECK_NULL);
  Klass* klass = UNPACK_PAIR(Klass, klass);
- InstanceKlass* iklass = check_field(klass, index, JVMCIENV);
+ InstanceKlass* iklass = check_field(klass, index, JVMCI_CHECK_NULL);
  fieldDescriptor fd(iklass, index);
  oop reflected = Reflection::new_field(&fd, CHECK_NULL);
  return JNIHandles::make_local(THREAD, reflected);
 C2V_END
 
 static jbyteArray get_encoded_annotation_data(InstanceKlass* holder, AnnotationArray* annotations_array, bool for_class,
  jint filter_length, jlong filter_klass_pointers,
- JavaThread* THREAD, JVMCIEnv* JVMCIENV) {
+ JavaThread* THREAD, JVMCI_TRAPS) {
  // Get a ConstantPool object for annotation parsing
  Handle jcp = reflect_ConstantPool::create(CHECK_NULL);
  reflect_ConstantPool::set_cp(jcp(), holder->constants());
@@ -3071,7 +3080,7 @@ C2V_END
 C2V_VMENTRY_NULL(jbyteArray, getEncodedFieldAnnotationData, (JNIEnv* env, jobject, ARGUMENT_PAIR(klass), jint index,
  jobject filter, jint filter_length, jlong filter_klass_pointers))
  CompilerThreadCanCallJava canCallJava(thread, true); // Requires Java support
- InstanceKlass* holder = check_field(InstanceKlass::cast(UNPACK_PAIR(Klass, klass)), index, JVMCIENV);
+ InstanceKlass* holder = check_field(InstanceKlass::cast(UNPACK_PAIR(Klass, klass)), index, JVMCI_CHECK_NULL);
  fieldDescriptor fd(holder, index);
  return get_encoded_annotation_data(holder, fd.annotations(), false, filter_length, filter_klass_pointers, THREAD, JVMCIENV);
 C2V_END

src/hotspot/share/jvmci/jvmciEnv.cpp

@@ -1210,7 +1210,7 @@ JVMCIObject JVMCIEnv::new_StackTraceElement(const methodHandle& method, int bci,
  }
 }
 
-JVMCIObject JVMCIEnv::new_HotSpotNmethod(const methodHandle& method, const char* name, jboolean isDefault, jlong compileId, JVMCI_TRAPS) {
+JVMCIObject JVMCIEnv::new_HotSpotNmethod(const methodHandle& method, const char* name, jboolean isDefault, jboolean profileDeopt, jlong compileId, JVMCI_TRAPS) {
  JavaThread* THREAD = JVMCI::compilation_tick(JavaThread::current()); // For exception macros.
 
  JVMCIObject methodObject = get_jvmci_method(method, JVMCI_CHECK_(JVMCIObject()));
@@ -1230,11 +1230,12 @@ JVMCIObject JVMCIEnv::new_HotSpotNmethod(const methodHandle& method, const char*
  jargs.push_oop(Handle(THREAD, HotSpotJVMCI::resolve(methodObject)));
  jargs.push_oop(nameStr);
  jargs.push_int(isDefault);
+ jargs.push_int(profileDeopt);
  jargs.push_long(compileId);
  JavaValue result(T_VOID);
  JavaCalls::call_special(&result, ik,
  vmSymbols::object_initializer_name(),
- vmSymbols::method_string_bool_long_signature(),
+ vmSymbols::method_string_bool_bool_long_signature(),
  &jargs, CHECK_(JVMCIObject()));
  return wrap(obj_h());
  } else {

src/hotspot/share/jvmci/jvmciEnv.hpp

@@ -426,7 +426,7 @@ class JVMCIEnv : public ResourceObj {
  JVMCIObjectArray new_byte_array_array(int length, JVMCI_TRAPS);
 
  JVMCIObject new_StackTraceElement(const methodHandle& method, int bci, JVMCI_TRAPS);
- JVMCIObject new_HotSpotNmethod(const methodHandle& method, const char* name, jboolean isDefault, jlong compileId, JVMCI_TRAPS);
+ JVMCIObject new_HotSpotNmethod(const methodHandle& method, const char* name, jboolean isDefault, jboolean profileDeopt, jlong compileId, JVMCI_TRAPS);
  JVMCIObject new_VMField(JVMCIObject name, JVMCIObject type, jlong offset, jlong address, JVMCIObject value, JVMCI_TRAPS);
  JVMCIObject new_VMFlag(JVMCIObject name, JVMCIObject type, JVMCIObject value, JVMCI_TRAPS);
  JVMCIObject new_VMIntrinsicMethod(JVMCIObject declaringClass, JVMCIObject name, JVMCIObject descriptor, int id, jboolean isAvailable, jboolean c1Supported, jboolean c2Supported, JVMCI_TRAPS);

src/hotspot/share/jvmci/jvmciJavaClasses.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,9 +100,10 @@
  end_class \
  start_class(HotSpotNmethod, jdk_vm_ci_hotspot_HotSpotNmethod) \
  boolean_field(HotSpotNmethod, isDefault) \
+ boolean_field(HotSpotNmethod, profileDeopt) \
  long_field(HotSpotNmethod, compileIdSnapshot) \
  object_field(HotSpotNmethod, method, "Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl;") \
- jvmci_constructor(HotSpotNmethod, "(Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl;Ljava/lang/String;ZJ)V") \
+ jvmci_constructor(HotSpotNmethod, "(Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl;Ljava/lang/String;ZZJ)V") \
  end_class \
  start_class(HotSpotCompiledCode, jdk_vm_ci_hotspot_HotSpotCompiledCode) \
  primarray_field(HotSpotCompiledCode, targetCode, "[B") \

src/hotspot/share/jvmci/jvmciRuntime.cpp

@@ -746,23 +746,28 @@ JVM_END
 void JVMCINMethodData::initialize(int nmethod_mirror_index,
  int nmethod_entry_patch_offset,
  const char* nmethod_mirror_name,
+ bool is_default,
+ bool profile_deopt,
  FailedSpeculation** failed_speculations)
 {
  _failed_speculations = failed_speculations;
  _nmethod_mirror_index = nmethod_mirror_index;
  guarantee(nmethod_entry_patch_offset != -1, "missing entry barrier");
  _nmethod_entry_patch_offset = nmethod_entry_patch_offset;
  if (nmethod_mirror_name != nullptr) {
- _has_name = true;
+ _properties.bits._has_name = 1;
  char* dest = (char*) name();
  strcpy(dest, nmethod_mirror_name);
  } else {
- _has_name = false;
+ _properties.bits._has_name = 0;
  }
+ _properties.bits._is_default = is_default;
+ _properties.bits._profile_deopt = profile_deopt;
 }
 
 void JVMCINMethodData::copy(JVMCINMethodData* data) {
- initialize(data->_nmethod_mirror_index, data->_nmethod_entry_patch_offset, data->name(), data->_failed_speculations);
+ initialize(data->_nmethod_mirror_index, data->_nmethod_entry_patch_offset, data->name(), data->_properties.bits._is_default,
+ data->_properties.bits._profile_deopt, data->_failed_speculations);
 }
 
 void JVMCINMethodData::add_failed_speculation(nmethod* nm, jlong speculation) {
@@ -2076,6 +2081,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
  char* failure_detail = nullptr;
 
  bool install_default = JVMCIENV->get_HotSpotNmethod_isDefault(nmethod_mirror) != 0;
+ bool profile_deopt = JVMCIENV->get_HotSpotNmethod_profileDeopt(nmethod_mirror) != 0;
  assert(JVMCIENV->isa_HotSpotNmethod(nmethod_mirror), "must be");
  JVMCIObject name = JVMCIENV->get_InstalledCode_name(nmethod_mirror);
  const char* nmethod_mirror_name = name.is_null() ? nullptr : JVMCIENV->as_utf8_string(name);
@@ -2122,7 +2128,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
  JVMCICompileState* compile_state = JVMCIENV->compile_state();
  bool failing_dep_is_call_site;
  result = validate_compile_task_dependencies(dependencies, compile_state, &failure_detail, failing_dep_is_call_site);
- if (result != JVMCI::ok) {
+ if (install_default && result != JVMCI::ok) {
  // While not a true deoptimization, it is a preemptive decompile.
  MethodData* mdp = method()->method_data();
  if (mdp != nullptr && !failing_dep_is_call_site) {
@@ -2143,6 +2149,8 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
  JVMCINMethodData* data = JVMCINMethodData::create(nmethod_mirror_index,
  nmethod_entry_patch_offset,
  nmethod_mirror_name,
+ install_default,
+ profile_deopt,
  failed_speculations);
  nm = nmethod::new_nmethod(method,
  compile_id,

src/hotspot/share/jvmci/jvmciRuntime.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,9 +48,21 @@ class MetadataHandles;
 class JVMCINMethodData : public ResourceObj {
  friend class JVMCIVMStructs;
 
- // Is HotSpotNmethod.name non-null? If so, the value is
- // embedded in the end of this object.
- bool _has_name;
+ union JVMCINMethodProperties {
+ uint8_t value;
+ struct {
+ // Is HotSpotNmethod.name non-null? If so, the value is
+ // embedded in the end of this object.
+ uint8_t _has_name : 1,
+ // HotSpotNmethod.isDefault (e.g., compilation scheduled by CompileBroker)
+ _is_default : 1,
+ // HotSpotNmethod.profileDeopt
+ _profile_deopt : 1,
+ : 5;
+ } bits;
+ };
+
+ JVMCINMethodProperties _properties;
 
  // Index for the HotSpotNmethod mirror in the nmethod's oops table.
  // This is -1 if there is no mirror in the oops table.
@@ -76,6 +88,8 @@ class JVMCINMethodData : public ResourceObj {
  void initialize(int nmethod_mirror_index,
  int nmethod_entry_patch_offset,
  const char* nmethod_mirror_name,
+ bool is_default,
+ bool profile_deopt,
  FailedSpeculation** failed_speculations);
 
  void* operator new(size_t size, const char* nmethod_mirror_name) {
@@ -88,11 +102,15 @@ class JVMCINMethodData : public ResourceObj {
  static JVMCINMethodData* create(int nmethod_mirror_index,
  int nmethod_entry_patch_offset,
  const char* nmethod_mirror_name,
+ bool is_default,
+ bool profile_deopt,
  FailedSpeculation** failed_speculations) {
  JVMCINMethodData* result = new (nmethod_mirror_name) JVMCINMethodData();
  result->initialize(nmethod_mirror_index,
  nmethod_entry_patch_offset,
  nmethod_mirror_name,
+ is_default,
+ profile_deopt,
  failed_speculations);
  return result;
  }
@@ -117,7 +135,7 @@ class JVMCINMethodData : public ResourceObj {
  void add_failed_speculation(nmethod* nm, jlong speculation);
 
  // Gets the JVMCI name of the nmethod (which may be null).
- const char* name() { return _has_name ? (char*)(((address) this) + sizeof(JVMCINMethodData)) : nullptr; }
+ const char* name() { return has_name() ? (char*)(((address) this) + sizeof(JVMCINMethodData)) : nullptr; }
 
  // Clears the HotSpotNmethod.address field in the mirror. If nm
  // is dead, the HotSpotNmethod.entryPoint field is also cleared.
@@ -132,6 +150,18 @@ class JVMCINMethodData : public ResourceObj {
  int nmethod_entry_patch_offset() {
  return _nmethod_entry_patch_offset;
  }
+
+ bool has_name() {
+ return _properties.bits._has_name;
+ }
+
+ bool is_default() {
+ return _properties.bits._is_default;
+ }
+
+ bool profile_deopt() {
+ return _properties.bits._profile_deopt;
+ }
 };
 
 // A top level class that represents an initialized JVMCI runtime.

src/hotspot/share/jvmci/jvmci_globals.cpp

@@ -106,7 +106,7 @@ bool JVMCIGlobals::check_jvmci_flags_are_consistent() {
  }
  if (BootstrapJVMCI && (TieredStopAtLevel < CompLevel_full_optimization)) {
  jio_fprintf(defaultStream::error_stream(),
- "-XX:+BootstrapJVMCI is not compatible with -XX:TieredStopAtLevel=%d\n", TieredStopAtLevel);
+ "-XX:+BootstrapJVMCI is not compatible with -XX:TieredStopAtLevel=%zd\n", TieredStopAtLevel);
  return false;
  }
  }

src/hotspot/share/jvmci/vmSymbols_jvmci.hpp

@@ -102,7 +102,7 @@
  template(bootstrapFinished_name, "bootstrapFinished") \
  template(forPrimitive_name, "forPrimitive") \
  template(forPrimitive_signature, "(CJ)Ljdk/vm/ci/meta/PrimitiveConstant;") \
- template(method_string_bool_long_signature,  "(Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl;Ljava/lang/String;ZJ)V") \
+ template(method_string_bool_bool_long_signature, "(Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl;Ljava/lang/String;ZZJ)V") \
 
 #endif