Refactoring.

Author: Michael Haas

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

@@ -107,10 +107,9 @@ protected InvokeStaticJavaMethodNode(NodeClass<? extends InvokeStaticJavaMethodN
         this.invokeKind = CallTargetNode.InvokeKind.Static;
     }
 
-    @SuppressWarnings("unused")
-    public static InvokeStaticJavaMethodNode create(MethodReference wrapper, ResolvedJavaMethod callerMethod, int bci, ValueNode... args) {
-        verifyTargetMethod(wrapper.targetMethod);
-        ResolvedJavaMethod targetMethod = wrapper.targetMethod;
+    public static InvokeStaticJavaMethodNode create(MethodReference methodReference, ResolvedJavaMethod callerMethod, int bci, ValueNode... args) {
+        verifyTargetMethod(methodReference.targetMethod);
+        ResolvedJavaMethod targetMethod = methodReference.targetMethod;
         JavaKind returnKind = targetMethod.getSignature().getReturnKind();
         return new InvokeStaticJavaMethodNode(TYPE, targetMethod, callerMethod, StampPair.createSingle(StampFactory.forKind(returnKind)), bci, args);
     }
@@ -123,9 +122,9 @@ public static InvokeStaticJavaMethodNode create(GraphBuilderContext b, ResolvedJ
         return create(b, targetMethod, b.getMethod(), returnStamp, bci, args);
     }
 
-    private static InvokeStaticJavaMethodNode createWithoutTargetMethod(GraphBuilderContext b, MethodReference method, Stamp returnStamp, int bci, ValueNode... args) {
+    private static InvokeStaticJavaMethodNode createWithoutTargetMethod(GraphBuilderContext b, MethodReference methodReference, Stamp returnStamp, int bci, ValueNode... args) {
         InvokeStaticJavaMethodNode invoke = create(b, null, b.getMethod(), StampPair.createSingle(returnStamp), bci, args);
-        invoke.methodReference = method;
+        invoke.methodReference = methodReference;
         return invoke;
     }
 
@@ -204,10 +203,10 @@ public Map<Object, Object> getDebugProperties(Map<Object, Object> map) {
         return debugProperties;
     }
 
-    public static boolean intrinsify(GraphBuilderContext b, @InjectedNodeParameter Stamp returnStamp, MethodReference method, ValueNode... args) {
+    public static boolean intrinsify(GraphBuilderContext b, @InjectedNodeParameter Stamp returnStamp, MethodReference methodReference, ValueNode... args) {
         GraphBuilderContext nonIntrinsicAncestor = b.getNonIntrinsicAncestor();
         int bci = nonIntrinsicAncestor == null ? BytecodeFrame.UNKNOWN_BCI : b.bci();
-        InvokeStaticJavaMethodNode invoke = InvokeStaticJavaMethodNode.createWithoutTargetMethod(b, method, returnStamp, bci, args);
+        InvokeStaticJavaMethodNode invoke = InvokeStaticJavaMethodNode.createWithoutTargetMethod(b, methodReference, returnStamp, bci, args);
         JavaKind returnKind = returnStamp.getStackKind();
         if (returnKind == JavaKind.Void) {
             b.add(invoke);
@@ -222,7 +221,7 @@ public static boolean intrinsify(GraphBuilderContext b, @InjectedNodeParameter S
      * set in the {@link MethodReference}, otherwise the node cannot be lowered.
      */
     @NodeIntrinsic
-    public static native void invoke(@ConstantNodeParameter MethodReference method, Object arg1);
+    public static native void invoke(@ConstantNodeParameter MethodReference methodReference, Object arg1);
 
     @SuppressWarnings("try")
     public Invoke replaceWithInvoke() {