Merge pull request #19554 from tajila/ehcr

Add cmdline opts to toggle extendedHCR

runtime/nls/vmut/j9vmutil.nls

@@ -190,3 +190,10 @@ J9NLS_VMUTIL_RECEIVERCLASS_NOT_SAME_OR_SUBTYPE_OF_CURRENTCLASS.explanation=NOTAG
 J9NLS_VMUTIL_RECEIVERCLASS_NOT_SAME_OR_SUBTYPE_OF_CURRENTCLASS.system_action=
 J9NLS_VMUTIL_RECEIVERCLASS_NOT_SAME_OR_SUBTYPE_OF_CURRENTCLASS.user_response=
 # END NON-TRANSLATABLE
+
+J9NLS_VMUTIL_OPENJ9_EXTENDED_HCR_DISABLED_WARNING=Warning: Extended HCR is disabled, enable with -XX:+EnableExtendedHCR.
+# START NON-TRANSLATABLE
+J9NLS_VMUTIL_OPENJ9_EXTENDED_HCR_DISABLED_WARNING.explanation=This JVM disables extended HCR by default, this may cause JVMTI failures in extended capabilites are required.
+J9NLS_VMUTIL_OPENJ9_EXTENDED_HCR_DISABLED_WARNING.system_action=None
+J9NLS_VMUTIL_OPENJ9_EXTENDED_HCR_DISABLED_WARNING.user_response=Add -XX:+EnableExtendedHCR commandline option to enable extended HCR
+# END NON-TRANSLATABLE

runtime/oti/j9consts.h

@@ -365,6 +365,7 @@ extern "C" {
 #define J9_EXTENDED_RUNTIME2_ALWAYS_KEEP_JNI_IDS 0x2000000
 #define J9_EXTENDED_RUNTIME2_NEVER_KEEP_JNI_IDS 0x4000000
 #define J9_EXTENDED_RUNTIME2_FFI_PROTO 0x8000000
+#define J9_EXTENDED_RUNTIME2_DISABLE_EXTENDED_HCR 0x10000000
 
 #define J9_OBJECT_HEADER_AGE_DEFAULT 0xA /* OBJECT_HEADER_AGE_DEFAULT */
 #define J9_OBJECT_HEADER_SHAPE_MASK 0xE /* OBJECT_HEADER_SHAPE_MASK */

runtime/oti/jvminit.h

@@ -419,6 +419,8 @@ enum INIT_STAGE {
 #define VMOPT_XXNOOPENJ9COMMANDLINEENV "-XX:-OpenJ9CommandLineEnv"
 #define VMOPT_XXCPULOADCOMPATIBILITY "-XX:+CpuLoadCompatibility"
 #define VMOPT_XXNOCPULOADCOMPATIBILITY "-XX:-CpuLoadCompatibility"
+#define VMOPT_XXENABLEEXTENDEDHCR "-XX:+EnableExtendedHCR"
+#define VMOPT_XXDISABLEEXTENDEDHCR "-XX:-EnableExtendedHCR"
 
 #if defined(J9VM_ZOS_3164_INTEROPERABILITY)
 #define VMOPT_XXENABLE3164INTEROPERABILITY "-XX:+Enable3164Interoperability"