Refactoring.

Author: Michael Haas

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

@@ -67,11 +67,11 @@ public class InvokeJavaMethodNode extends DeoptimizingFixedWithNextNode implemen
      * {@link InvokeJavaMethodNode} creation. See
      * {@code HotSpotTruffleSafepointLoweringSnippet#pollSnippet} for usage details.
      */
-    public static final class MethodWrapper {
+    public static final class MethodReference {
         private final String name;
         private ResolvedJavaMethod targetMethod;
 
-        public MethodWrapper(String name) {
+        public MethodReference(String name) {
             this.name = name;
         }
 
@@ -84,7 +84,7 @@ public String getName() {
         }
     }
 
-    public static final MethodWrapper TRUFFLE_SAFEPOINT = new MethodWrapper("HotSpotThreadLocalHandshake.doHandshake");
+    public static final MethodReference TRUFFLE_SAFEPOINT = new MethodReference("HotSpotThreadLocalHandshake.doHandshake");
 
     @Input protected NodeInputList<ValueNode> arguments;
 
@@ -93,7 +93,7 @@ public String getName() {
     private ResolvedJavaMethod targetMethod;
     private final CallTargetNode.InvokeKind invokeKind;
     private final StampPair returnStamp;
-    private MethodWrapper methodWrapper;
+    private MethodReference methodReference;
 
     @SuppressWarnings("this-escape")
     protected InvokeJavaMethodNode(NodeClass<? extends InvokeJavaMethodNode> c, ResolvedJavaMethod targetMethod, ResolvedJavaMethod callerMethod,
@@ -108,7 +108,7 @@ protected InvokeJavaMethodNode(NodeClass<? extends InvokeJavaMethodNode> c, Reso
     }
 
     @SuppressWarnings("unused")
-    public static InvokeJavaMethodNode create(MethodWrapper wrapper, ResolvedJavaMethod callerMethod, int bci, ValueNode... args) {
+    public static InvokeJavaMethodNode create(MethodReference wrapper, ResolvedJavaMethod callerMethod, int bci, ValueNode... args) {
         verifyTargetMethod(wrapper.targetMethod);
         ResolvedJavaMethod targetMethod = wrapper.targetMethod;
         JavaKind returnKind = targetMethod.getSignature().getReturnKind();
@@ -123,8 +123,10 @@ public static InvokeJavaMethodNode create(GraphBuilderContext b, ResolvedJavaMet
         return create(b, targetMethod, b.getMethod(), returnStamp, bci, args);
     }
 
-    private static InvokeJavaMethodNode create(GraphBuilderContext b, Stamp returnStamp, int bci, ValueNode... args) {
-        return create(b, null, b.getMethod(), StampPair.createSingle(returnStamp), bci, args);
+    private static InvokeJavaMethodNode createWithoutTargetMethod(GraphBuilderContext b, MethodReference method, Stamp returnStamp, int bci, ValueNode... args) {
+        InvokeJavaMethodNode invoke = create(b, null, b.getMethod(), StampPair.createSingle(returnStamp), bci, args);
+        invoke.methodReference = method;
+        return invoke;
     }
 
     private static InvokeJavaMethodNode create(GraphBuilderContext b, ResolvedJavaMethod targetMethod, ResolvedJavaMethod callerMethod,
@@ -186,7 +188,7 @@ public String toString(Verbosity verbosity) {
             sb.append(super.toString(verbosity));
             sb.append("#");
             if (targetMethod == null) {
-                sb.append(methodWrapper.getName());
+                sb.append(methodReference.getName());
             } else {
                 sb.append(targetMethod.format("%h.%n"));
             }
@@ -198,15 +200,14 @@ public String toString(Verbosity 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"));
+        debugProperties.put("targetMethod", targetMethod == null ? methodReference.getName() : targetMethod.format("%h.%n"));
         return debugProperties;
     }
 
-    public static boolean intrinsify(GraphBuilderContext b, @InjectedNodeParameter Stamp returnStamp, MethodWrapper method, ValueNode... args) {
+    public static boolean intrinsify(GraphBuilderContext b, @InjectedNodeParameter Stamp returnStamp, MethodReference method, ValueNode... args) {
         GraphBuilderContext nonIntrinsicAncestor = b.getNonIntrinsicAncestor();
         int bci = nonIntrinsicAncestor == null ? BytecodeFrame.UNKNOWN_BCI : b.bci();
-        InvokeJavaMethodNode invoke = InvokeJavaMethodNode.create(b, returnStamp, bci, args);
-        invoke.methodWrapper = method;
+        InvokeJavaMethodNode invoke = InvokeJavaMethodNode.createWithoutTargetMethod(b, method, returnStamp, bci, args);
         JavaKind returnKind = returnStamp.getStackKind();
         if (returnKind == JavaKind.Void) {
             b.add(invoke);
@@ -218,10 +219,10 @@ public static boolean intrinsify(GraphBuilderContext b, @InjectedNodeParameter S
 
     /**
      * Calls a static Java method with one argument and no return value. The target method has to be
-     * set in the {@link MethodWrapper}, otherwise the node cannot be lowered.
+     * set in the {@link MethodReference}, otherwise the node cannot be lowered.
      */
     @NodeIntrinsic
-    public static native void invoke(@ConstantNodeParameter MethodWrapper method, Object arg1);
+    public static native void invoke(@ConstantNodeParameter MethodReference method, Object arg1);
 
     @SuppressWarnings("try")
     public Invoke replaceWithInvoke() {
@@ -247,8 +248,8 @@ public InvokeNode createInvoke(StructuredGraph graph) {
     public void lower(LoweringTool tool) {
         if (graph().getGuardsStage().areFrameStatesAtDeopts()) {
             if (targetMethod == null) {
-                GraalError.guarantee(methodWrapper != null, "method wrapper shouldn't be null");
-                setTargetMethod(methodWrapper.targetMethod);
+                GraalError.guarantee(methodReference != null, "method reference shouldn't be null");
+                setTargetMethod(methodReference.targetMethod);
             }
             Invoke invoke = replaceWithInvoke();
             assert invoke.asNode().verify();