Address review comments

Author: vjovanov

sdk/mx.sdk/mx_sdk_vm_ng.py

@@ -380,7 +380,7 @@ def get_build_args(self):
         build_args += [
             '-R:+EnableSignalHandling',
             '-R:+InstallSegfaultHandler',
-            '-H:+UnlockExperimentalVMOptions', '-H:+InstallJavaExitHandlersForSharedLibrary', '-H:-UnlockExperimentalVMOptions'
+            '-H:+UnlockExperimentalVMOptions', '-H:+InstallExitHandlers', '-H:-UnlockExperimentalVMOptions',
         ]
 
         # Monitoring flags

substratevm/CHANGELOG.md

@@ -19,7 +19,7 @@ This changelog summarizes major changes to GraalVM Native Image.
 * (GR-60209) New syntax for configuration of the [Foreign Function & Memory API](https://github.com/oracle/graal/blob/master/docs/reference-manual/native-image/ForeignInterface.md)
 * (GR-64584) Experimental option `-H:+RelativeCodePointers` to significantly reduce relocation entries in position-independent executables and shared libraries.
 * (GR-60238) JNI registration is now included as part of the `"reflection"` section of _reachability-metadata.json_ using the `"jniAccessible"` attribute. Registrations performed through the `"jni"` section of _reachability-metadata.json_ and through _jni-config.json_ will still be accepted and parsed correctly.
-* (GR-64787) Enable `--install-exit-handlers` by default for executables and deprecate the option. If shared libraries were using this flag, the same functionality can be restored by using `-H:+InstallJavaExitHandlersForSharedLibrary`. 
+* (GR-64787) Enable `--install-exit-handlers` by default for executables deprecate the option. To restore the previous functionality needs to be restored one can use `-H:-InstallExitHandlers`. To enable in shared libraries use `-H:-InstallExitHandlers`. 
 
 ## GraalVM for JDK 24 (Internal Version 24.2.0)
 * (GR-59717) Added `DuringSetupAccess.registerObjectReachabilityHandler` to allow registering a callback that is executed when an object of a specified type is marked as reachable during heap scanning.

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateExitHandlerFeature.java

@@ -24,8 +24,6 @@
  */
 package com.oracle.svm.core;
 
-import org.graalvm.nativeimage.ImageInfo;
-
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
@@ -36,7 +34,7 @@
 public class SubstrateExitHandlerFeature implements InternalFeature {
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess access) {
-        if (!ImageInfo.isSharedLibrary() || SubstrateOptions.DeprecatedOptions.InstallExitHandlers.getValue() || SubstrateOptions.InstallJavaExitHandlersForSharedLibrary.getValue()) {
+        if (SubstrateOptions.InstallExitHandlers.getValue()) {
             RuntimeSupport.getRuntimeSupport().addStartupHook(new SubstrateExitHandlerStartupHook());
         }
     }
@@ -45,10 +43,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
 final class SubstrateExitHandlerStartupHook implements RuntimeSupport.Hook {
     @Override
     public void execute(boolean isFirstIsolate) {
-        if (SubstrateOptions.EnableSignalHandling.getValue()) {
-            if (isFirstIsolate) {
-                Target_java_lang_Terminator.setup();
-            }
+        if (SubstrateOptions.EnableSignalHandling.getValue() && isFirstIsolate) {
+            Target_java_lang_Terminator.setup();
         }
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -591,11 +591,6 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean o
                 }
             }
         };
-
-        @APIOption(name = "install-exit-handlers", deprecated = "Enabled by default for executables. For shared libraries (when --shared is used), use the experimental option -H:+InstallJavaExitHandlersForSharedLibrary.")//
-        @Option(help = "Provide java.lang.Terminator exit handlers", deprecated = true, deprecationMessage = "Enabled by default for executables. For shared libraries (when --shared is used), use the experimental option -H:+InstallJavaExitHandlersForSharedLibrary.")//
-        protected static final HostedOptionKey<Boolean> InstallExitHandlers = new HostedOptionKey<>(false);
-
     }
 
     @Option(help = "Enable detection and runtime container configuration support.")//
@@ -1075,6 +1070,23 @@ private static void validateStripDebugInfo(HostedOptionKey<Boolean> optionKey) {
     @Option(help = "Emit debuginfo debug.svm.imagebuild.* sections with detailed image-build options.")//
     public static final HostedOptionKey<Boolean> UseImagebuildDebugSections = new HostedOptionKey<>(true);
 
+    @APIOption(name = "install-exit-handlers", deprecated = "--install-exit-handlers is enabled by default for executables and it can likely be removed. To use this option for the shared libraries, please use -H:+InstallExitHandlers.")//
+    @Option(help = "Provide java.lang.Terminator exit handlers. Default value is true for executables and false for shared libraries because this option installs signal handlers.", type = Expert, stability = OptionStability.EXPERIMENTAL)//
+    protected static final HostedOptionKey<Boolean> InstallExitHandlers = new HostedOptionKey<>(null) {
+        @Override
+        public Boolean getValueOrDefault(UnmodifiableEconomicMap<OptionKey<?>, Object> values) {
+            if (values.containsKey(this)) {
+                return (Boolean) values.get(this);
+            }
+            return ImageInfo.isExecutable();
+        }
+
+        @Override
+        public Boolean getValue(OptionValues values) {
+            return getValueOrDefault(values.getMap());
+        }
+    };
+
     @Fold
     public static boolean supportCompileInIsolates() {
         UserError.guarantee(!ConcealedOptions.SupportCompileInIsolates.getValue() || SpawnIsolates.getValue(),
@@ -1098,15 +1110,6 @@ public static boolean shouldCompileInIsolates() {
     @Option(help = "Size of the reserved address space of each compilation isolate (0: default for new isolates).") //
     public static final RuntimeOptionKey<Long> CompilationIsolateAddressSpaceSize = new RuntimeOptionKey<>(0L);
 
-    @Option(help = "Provide java.lang.Terminator exit handlers for shared libraries. Note: this flag must be used with -XX:+EnableSignalHandling and will run shutdown hooks only in one isolate.", stability = OptionStability.EXPERIMENTAL, type = Expert)//
-    public static final HostedOptionKey<Boolean> InstallJavaExitHandlersForSharedLibrary = new HostedOptionKey<>(false, key -> {
-        if (key.getValue()) {
-            UserError.guarantee(ImageInfo.isSharedLibrary(), "%s can be used only for shared libraries (when image is built with %s)",
-                            SubstrateOptionsParser.commandArgument(key, "+"),
-                            SubstrateOptionsParser.commandArgument(SharedLibrary, "+"));
-        }
-    });
-
     /** Query these options only through an appropriate method. */
     public static class ConcealedOptions {