Merge pull request #22989 from thallium/debug-mapper

Add command line option for debug mapper

Author: tajila

runtime/oti/j9consts.h

@@ -376,6 +376,7 @@ extern "C" {
 #define J9_EXTENDED_RUNTIME3_MODULE_PACKAGES_INITIALIZED 0x8
 #define J9_EXTENDED_RUNTIME3_DISCLAIM_ROM_CLASS_MEMORY 0x10
 #define J9_EXTENDED_RUNTIME3_DISCLAIM_RAM_CLASS_MEMORY 0x20
+#define J9_EXTENDED_RUNTIME3_USE_DEBUG_LOCAL_MAP 0x40
 
 #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

@@ -415,6 +415,8 @@ enum INIT_STAGE {
 #define VMOPT_XXNOCPULOADCOMPATIBILITY "-XX:-CpuLoadCompatibility"
 #define VMOPT_XXENABLEEXTENDEDHCR "-XX:+EnableExtendedHCR"
 #define VMOPT_XXDISABLEEXTENDEDHCR "-XX:-EnableExtendedHCR"
+#define VMOPT_XXUSEDEBUGLOCALMAP "-XX:+UseDebugLocalMap"
+#define VMOPT_XXNOUSEDEBUGLOCALMAP "-XX:-UseDebugLocalMap"
 
 #if defined(J9VM_ZOS_3164_INTEROPERABILITY)
 #define VMOPT_XXENABLE3164INTEROPERABILITY "-XX:+Enable3164Interoperability"

runtime/vm/jvminit.c

@@ -4474,6 +4474,16 @@ processVMArgsFromFirstToLast(J9JavaVM * vm)
 		}
 	}
 
+	{
+		IDATA useDebugLocalMap = FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXUSEDEBUGLOCALMAP, NULL);
+		IDATA noUseDebugLocalMap = FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXNOUSEDEBUGLOCALMAP, NULL);
+		if (useDebugLocalMap > noUseDebugLocalMap) {
+			vm->extendedRuntimeFlags3 |= J9_EXTENDED_RUNTIME3_USE_DEBUG_LOCAL_MAP;
+		} else if (useDebugLocalMap < noUseDebugLocalMap) {
+			vm->extendedRuntimeFlags3 &= ~J9_EXTENDED_RUNTIME3_USE_DEBUG_LOCAL_MAP;
+		}
+	}
+
 	if (FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXKEEPJNIIDS, NULL) != -1) {
 		vm->extendedRuntimeFlags2 |= J9_EXTENDED_RUNTIME2_ALWAYS_KEEP_JNI_IDS;
 	}
@@ -7971,6 +7981,10 @@ protectedInitializeJavaVM(J9PortLibrary* portLibrary, void * userData)
 	}
 #endif
 
+	if (J9_ARE_ANY_BITS_SET(vm->extendedRuntimeFlags3, J9_EXTENDED_RUNTIME3_USE_DEBUG_LOCAL_MAP)) {
+		installDebugLocalMapper(vm);
+	}
+
 	initializeInitialMethods(vm);
 
 	if (JNI_OK != (stageRC = runInitializationStage(vm, ABOUT_TO_BOOTSTRAP))) {