diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java index fff27d27a501..b93548785c5d 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java @@ -158,7 +158,6 @@ protected void onValueUpdate(EconomicMap, Object> values, Boolean o public static final String IMAGE_MODULEPATH_PREFIX = "-imagemp"; public static final String WATCHPID_PREFIX = "-watchpid"; private static ValueUpdateHandler optimizeValueUpdateHandler; - private static ValueUpdateHandler debugInfoValueUpdateHandler = SubstrateOptions::defaultDebugInfoValueUpdateHandler; @Fold public static boolean getSourceLevelDebug() { @@ -264,10 +263,6 @@ public static void setOptimizeValueUpdateHandler(ValueUpdateHandler updateHandler) { - SubstrateOptions.debugInfoValueUpdateHandler = updateHandler; - } - @Option(help = "Track NodeSourcePositions during runtime-compilation")// public static final HostedOptionKey IncludeNodeSourcePositions = new HostedOptionKey<>(false); @@ -640,17 +635,13 @@ public static int codeAlignment() { public static final HostedOptionKey GenerateDebugInfo = new HostedOptionKey<>(0) { @Override protected void onValueUpdate(EconomicMap, Object> values, Integer oldValue, Integer newValue) { - debugInfoValueUpdateHandler.onValueUpdate(values, newValue); + if (OS.WINDOWS.isCurrent()) { + /* Keep symbols on Windows. The symbol table is part of the pdb-file. */ + DeleteLocalSymbols.update(values, newValue == 0); + } } }; - public static void defaultDebugInfoValueUpdateHandler(EconomicMap, Object> values, Integer newValue) { - if (OS.WINDOWS.isCurrent()) { - /* Keep symbols on Windows. The symbol table is part of the pdb-file. */ - DeleteLocalSymbols.update(values, newValue == 0); - } - } - @Option(help = "Search path for source files for Application or GraalVM classes (list of comma-separated directories or jar files)")// public static final HostedOptionKey DebugInfoSourceSearchPath = new HostedOptionKey<>(LocatableMultiOptionValue.Strings.commaSeparated());