Support for igv.

Author: Michael Haas

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/InvokeJavaMethodNode.java

@@ -5,6 +5,8 @@
 import static jdk.graal.compiler.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE;
 import static jdk.graal.compiler.nodes.Invoke.SIZE_UNKNOWN_RATIONALE;
 
+import java.util.Map;
+
 import jdk.graal.compiler.core.common.type.Stamp;
 import jdk.graal.compiler.core.common.type.StampFactory;
 import jdk.graal.compiler.core.common.type.StampPair;
@@ -14,6 +16,7 @@
 import jdk.graal.compiler.graph.NodeClass;
 import jdk.graal.compiler.graph.NodeInputList;
 import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
 import jdk.graal.compiler.nodes.CallTargetNode;
 import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode;
 import jdk.graal.compiler.nodes.InliningLog;
@@ -65,14 +68,23 @@ public class InvokeJavaMethodNode extends DeoptimizingFixedWithNextNode implemen
      * {@code HotSpotTruffleSafepointLoweringSnippet#pollSnippet} for usage details.
      */
     public static final class MethodWrapper {
-        ResolvedJavaMethod targetMethod;
+        private final String name;
+        private ResolvedJavaMethod targetMethod;
+
+        public MethodWrapper(String name) {
+            this.name = name;
+        }
 
         public void setTargetMethod(ResolvedJavaMethod targetMethod) {
             this.targetMethod = targetMethod;
         }
+
+        public String getName() {
+            return name;
+        }
     }
 
-    public static final MethodWrapper TRUFFLE_SAFEPOINT = new MethodWrapper();
+    public static final MethodWrapper TRUFFLE_SAFEPOINT = new MethodWrapper("HotSpotThreadLocalHandshake.doHandshake");
 
     @Input protected NodeInputList<ValueNode> arguments;
 
@@ -167,6 +179,29 @@ public StampPair getReturnStamp() {
         return returnStamp;
     }
 
+    @Override
+    public String toString(Verbosity verbosity) {
+        if (verbosity == Verbosity.Name) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(super.toString(verbosity));
+            sb.append("#");
+            if (targetMethod == null) {
+                sb.append(methodWrapper.getName());
+            } else {
+                sb.append(targetMethod.format("%h.%n"));
+            }
+            return sb.toString();
+        }
+        return super.toString(verbosity);
+    }
+
+    @Override
+    public Map<Object, Object> getDebugProperties(Map<Object, Object> map) {
+        Map<Object, Object> debugProperties = super.getDebugProperties(map);
+        debugProperties.put("targetMethod", targetMethod == null ? methodWrapper.getName() : targetMethod.format("%h.%n"));
+        return debugProperties;
+    }
+
     public static boolean intrinsify(GraphBuilderContext b, @InjectedNodeParameter Stamp returnStamp, MethodWrapper method, ValueNode... args) {
         GraphBuilderContext nonIntrinsicAncestor = b.getNonIntrinsicAncestor();
         int bci = nonIntrinsicAncestor == null ? BytecodeFrame.UNKNOWN_BCI : b.bci();