made intellij suggested improvements

Author: dougxc

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

@@ -72,13 +72,14 @@ static class Options {
     }
 
     // cached validity of candidate objdump executables.
-    private Map<String, Boolean> objdumpCache = new HashMap<>();
+    private static final Map<String, Boolean> objdumpCache = new HashMap<>();
 
     private static Process createProcess(String[] cmd) {
         ProcessBuilder pb = new ProcessBuilder(cmd);
         try {
             return pb.start();
         } catch (IOException e) {
+            TTY.printf("WARNING: Error executing '%s' (%s)%n", String.join(" ", cmd), e);
         }
         return null;
     }
@@ -129,8 +130,7 @@ public String disassembleCompiledCode(OptionValues options, CodeCacheProvider co
                 putAnnotation(annotations, a.getPosition(), a.toString());
             }
             for (Infopoint infopoint : compResult.getInfopoints()) {
-                if (infopoint instanceof Call) {
-                    Call call = (Call) infopoint;
+                if (infopoint instanceof Call call) {
                     if (call.debugInfo != null) {
                         putAnnotation(annotations, call.pcOffset + call.size, CodeUtil.append(new StringBuilder(100), call.debugInfo, slotFormatter).toString());
                     }
@@ -170,15 +170,14 @@ public String disassembleCompiledCode(OptionValues options, CodeCacheProvider co
                 String errLine = ebr.readLine();
                 if (errLine != null) {
                     System.err.println("Error output from executing: " + CollectionsUtil.mapAndJoin(cmdline, e -> quoteShellArg(String.valueOf(e)), " "));
-                    System.err.println(errLine);
-                    while ((errLine = ebr.readLine()) != null) {
+                    do {
                         System.err.println(errLine);
-                    }
+                    } while ((errLine = ebr.readLine()) != null);
                 }
             }
             return sb.toString();
         } catch (IOException e) {
-            e.printStackTrace();
+            e.printStackTrace(TTY.out);
             return null;
         } finally {
             if (tmp != null) {
@@ -188,9 +187,9 @@ public String disassembleCompiledCode(OptionValues options, CodeCacheProvider co
     }
 
     /**
-     * Pattern for a single shell command argument that does not need to quoted.
+     * Pattern for a single shell command argument that does not need to be quoted.
      */
-    private static final Pattern SAFE_SHELL_ARG = Pattern.compile("[A-Za-z0-9@%_\\-\\+=:,\\./]+");
+    private static final Pattern SAFE_SHELL_ARG = Pattern.compile("[A-Za-z0-9@%_\\-+=:,./]+");
 
     /**
      * Reliably quote a string as a single shell command argument.
@@ -215,44 +214,47 @@ private String getObjdump(OptionValues options) {
         String candidates = Options.ObjdumpExecutables.getValue(options);
         if (candidates != null && !candidates.isEmpty()) {
             for (String candidate : candidates.split(",")) {
-                // first checking to see if a cached verdict for this candidate exists.
-                Boolean cachedQuery = objdumpCache.get(candidate);
-                if (cachedQuery != null) {
-                    if (cachedQuery.booleanValue()) {
-                        return candidate;
-                    } else {
-                        // this candidate was previously determined to not be acceptable.
-                        continue;
+                synchronized (objdumpCache) {
+                    // first checking to see if a cached verdict for this candidate exists.
+                    Boolean cachedQuery = objdumpCache.get(candidate);
+                    if (cachedQuery != null) {
+                        if (cachedQuery) {
+                            return candidate;
+                        } else {
+                            // this candidate was previously determined to not be acceptable.
+                            continue;
+                        }
                     }
-                }
-                try {
                     String[] cmd = {candidate, "--version"};
-                    Process proc = createProcess(cmd);
-                    if (proc == null) {
-                        // bad candidate.
-                        objdumpCache.put(candidate, Boolean.FALSE);
-                        return null;
-                    }
-                    InputStream is = proc.getInputStream();
-                    int exitValue = proc.waitFor();
-                    if (exitValue == 0) {
-                        byte[] buf = new byte[is.available()];
-                        int pos = 0;
-                        while (pos < buf.length) {
-                            int read = is.read(buf, pos, buf.length - pos);
-                            pos += read;
+                    try {
+                        Process proc = createProcess(cmd);
+                        if (proc == null) {
+                            // bad candidate.
+                            objdumpCache.put(candidate, Boolean.FALSE);
+                            return null;
                         }
-                        String output = new String(buf);
-                        if (output.contains("GNU objdump")) {
-                            // this candidate meets the criteria.
-                            objdumpCache.put(candidate, Boolean.TRUE);
-                            return candidate;
+                        InputStream is = proc.getInputStream();
+                        int exitValue = proc.waitFor();
+                        if (exitValue == 0) {
+                            byte[] buf = new byte[is.available()];
+                            int pos = 0;
+                            while (pos < buf.length) {
+                                int read = is.read(buf, pos, buf.length - pos);
+                                pos += read;
+                            }
+                            String output = new String(buf);
+                            if (output.contains("GNU objdump")) {
+                                // this candidate meets the criteria.
+                                objdumpCache.put(candidate, Boolean.TRUE);
+                                return candidate;
+                            }
                         }
+                    } catch (IOException | InterruptedException e) {
+                        TTY.printf("WARNING: Error reading input from '%s' (%s)%n", String.join(" ", cmd), e);
                     }
-                } catch (IOException | InterruptedException e) {
+                    // bad candidate.
+                    objdumpCache.put(candidate, Boolean.FALSE);
                 }
-                // bad candidate.
-                objdumpCache.put(candidate, Boolean.FALSE);
             }
         }
         return null;