--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java	Mon Dec 12 16:16:27 2016 +0300
+++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java	Wed Mar 22 13:42:45 2017 -0700
@@ -97,6 +97,18 @@
         assert !isPlaceholderBci(bci);
     }
 
+    public ValueNode getArgument(int i) {
+        return arguments.get(i);
+    }
+
+    public int getArgumentCount() {
+        return arguments.size();
+    }
+
+    public ValueNode[] toArgumentArray() {
+        return arguments.toArray(new ValueNode[0]);
+    }
+
     public int getBci() {
         return bci;
     }
@@ -161,7 +173,7 @@
                     ((Lowerable) nonNullReceiver).lower(tool);
                 }
             }
-            InliningUtil.inline(invoke, replacementGraph, false, null, targetMethod);
+            InliningUtil.inline(invoke, replacementGraph, false, targetMethod);
             Debug.dump(Debug.INFO_LOG_LEVEL, graph(), "After inlining replacement %s", replacementGraph);
         } else {
             if (isPlaceholderBci(invoke.bci())) {
@@ -184,7 +196,7 @@
         }
     }
 
-    protected InvokeNode replaceWithInvoke() {
+    public InvokeNode replaceWithInvoke() {
         InvokeNode invoke = createInvoke();
         graph().replaceFixedWithFixed(this, invoke);
         return invoke;