disable ObjdumpDisassemblerProvider in libgraal

Author: dougxc

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/ObjdumpDisassemblerProvider.java

@@ -36,6 +36,9 @@
 import java.util.regex.Pattern;
 
 import jdk.graal.compiler.code.CompilationResult.CodeAnnotation;
+import jdk.graal.compiler.core.common.NativeImageSupport;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TTY;
 import jdk.graal.compiler.options.Option;
 import jdk.graal.compiler.options.OptionKey;
 import jdk.graal.compiler.options.OptionType;
@@ -91,6 +94,9 @@ public boolean isAvailable(OptionValues options) {
 
     @Override
     public String disassembleCompiledCode(OptionValues options, CodeCacheProvider codeCache, CompilationResult compResult) {
+        if (NativeImageSupport.inRuntimeCode() && !ENABLE_OBJDUMP) {
+            throw new GraalError("Objdump not available");
+        }
         String objdump = getObjdump(options);
         if (objdump == null) {
             return null;
@@ -206,13 +212,36 @@ public static String quoteShellArg(String arg) {
         return "'" + arg.replace("'", "'\"'\"'") + "'";
     }
 
+    private static final String ENABLE_OBJDUMP_PROP = "debug.jdk.graal.enableObjdump";
+
+    /**
+     * Support for objdump is excluded by default from native images (including libgraal) to reduce
+     * the image size. It also reduces security concerns related to running subprocesses.
+     *
+     * To objdump during development, set the {@value #ENABLE_OBJDUMP_PROP} system property to true
+     * when building native images.
+     */
+    private static final boolean ENABLE_OBJDUMP = Boolean.parseBoolean(GraalServices.getSavedProperty(ENABLE_OBJDUMP_PROP));
+
+    private static boolean objdumpUnsupportedWarned;
+
     /**
      * Searches for a valid GNU objdump executable.
      */
-    private String getObjdump(OptionValues options) {
+    private static String getObjdump(OptionValues options) {
         // for security, user must provide the possible objdump locations.
         String candidates = Options.ObjdumpExecutables.getValue(options);
         if (candidates != null && !candidates.isEmpty()) {
+            if (NativeImageSupport.inRuntimeCode() && !ENABLE_OBJDUMP) {
+                if (!objdumpUnsupportedWarned) {
+                    // Ignore races or multiple isolates - an extra warning is ok
+                    objdumpUnsupportedWarned = true;
+                    TTY.printf("WARNING: Objdump not supported as the %s system property was false when building.%n",
+                                    ENABLE_OBJDUMP_PROP);
+                }
+                return null;
+            }
+
             for (String candidate : candidates.split(",")) {
                 synchronized (objdumpCache) {
                     // first checking to see if a cached verdict for this candidate exists.

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/IgvDumpChannel.java

@@ -50,12 +50,12 @@ final class IgvDumpChannel implements WritableByteChannel {
     private static final String ENABLE_NETWORK_DUMPING_PROP = "debug.jdk.graal.enableNetworkDumping";
 
     /**
-     * Support for IGV dumping to a network port is excluded by default from libgraal to reduce the
-     * libgraal image size. It also reduces security concerns related to opening random network
-     * connections.
+     * Support for IGV dumping to a network port is excluded by default from native images
+     * (including libgraal) to reduce the image size. It also reduces security concerns related to
+     * opening random network connections.
      *
-     * To enable IGV dumping to the network during libgraal based development, set the
-     * {@value #ENABLE_NETWORK_DUMPING_PROP} system property to true when building libgraal.
+     * To enable IGV dumping to the network during development, set the
+     * {@value #ENABLE_NETWORK_DUMPING_PROP} system property to true when building native images.
      */
     private static final boolean ENABLE_NETWORK_DUMPING = Boolean.parseBoolean(GraalServices.getSavedProperty(ENABLE_NETWORK_DUMPING_PROP));
 
@@ -107,7 +107,7 @@ WritableByteChannel channel() throws IOException {
                     if (!networkDumpingUnsupportedWarned) {
                         // Ignore races or multiple isolates - an extra warning is ok
                         networkDumpingUnsupportedWarned = true;
-                        TTY.printf("WARNING: Graph dumping to network not supported as the %s system property was false when building libgraal - dumping to file instead.%n",
+                        TTY.printf("WARNING: Graph dumping to network not supported as the %s system property was false when building - dumping to file instead.%n",
                                         ENABLE_NETWORK_DUMPING_PROP);
                     }
                     sharedChannel = createFileChannel(pathProvider, null);