jruby · Feb 27, 2016 · Feb 27, 2016
diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/TaintResultNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/TaintResultNode.java
@@ -84,7 +84,7 @@ public Object execute(VirtualFrame frame) {
             // scenario is that the argument at that position is a NotProvided argument, which doesn't take up
             // a space in the frame.
             if (taintFromParameter < RubyArguments.getArgumentsCount(frame)) {
-                final Object argument = RubyArguments.getArgument(frame.getArguments(), taintFromParameter);
+                final Object argument = RubyArguments.getArgument(frame, taintFromParameter);
 
                 if (argument instanceof DynamicObject) {
                     final DynamicObject taintSource = (DynamicObject) argument;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusSingleBlockArgNode.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusSingleBlockArgNode.java
@@ -45,7 +45,7 @@ public Object execute(VirtualFrame frame) {
             return nil();
         } else {
             if (singleArgProfile.profile(userArgumentCount == 1)) {
-                return RubyArguments.getArgument(frame.getArguments(), 0);
+                return RubyArguments.getArgument(frame, 0);
 
             } else {
                 Object[] extractedArguments = RubyArguments.getArguments(frame);

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadOptionalArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadOptionalArgumentNode.java
@@ -60,7 +60,7 @@ public Object execute(VirtualFrame frame) {
         }
 
         if (RubyArguments.getArgumentsCount(frame) >= effectiveMinimum) {
-            return RubyArguments.getArgument(frame.getArguments(), index);
+            return RubyArguments.getArgument(frame, index);
         }
 
         defaultValueProfile.enter();

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadPostArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadPostArgumentNode.java
@@ -27,7 +27,7 @@ public ReadPostArgumentNode(RubyContext context, SourceSection sourceSection, in
     public Object execute(VirtualFrame frame) {
         final int count = RubyArguments.getArgumentsCount(frame);
         final int effectiveIndex = count - indexFromCount;
-        return RubyArguments.getArgument(frame.getArguments(), effectiveIndex);
+        return RubyArguments.getArgument(frame, effectiveIndex);
     }
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadPreArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadPreArgumentNode.java
@@ -36,7 +36,7 @@ public ReadPreArgumentNode(RubyContext context, SourceSection sourceSection, int
     @Override
     public Object execute(VirtualFrame frame) {
         if (index < RubyArguments.getArgumentsCount(frame)) {
-            return argumentValueProfile.profile(RubyArguments.getArgument(frame.getArguments(), index));
+            return argumentValueProfile.profile(RubyArguments.getArgument(frame, index));
         }
 
         outOfRangeProfile.enter();

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadRestArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadRestArgumentNode.java
@@ -51,7 +51,7 @@ public Object execute(VirtualFrame frame) {
         int endIndex = count + negativeEndIndex;
 
         if (keywordArguments) {
-            final Object lastArgument = RubyArguments.getArgument(frame.getArguments(), RubyArguments.getArgumentsCount(frame) - 1);
+            final Object lastArgument = RubyArguments.getArgument(frame, RubyArguments.getArgumentsCount(frame) - 1);
 
             if (RubyGuards.isRubyHash(lastArgument)) {
                 endIndex -= 1;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadUserKeywordsHashNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadUserKeywordsHashNode.java
@@ -33,7 +33,7 @@ public Object execute(VirtualFrame frame) {
             return null;
         }
 
-        final Object lastArgument = RubyArguments.getArgument(frame.getArguments(), argumentCount - 1);
+        final Object lastArgument = RubyArguments.getArgument(frame, argumentCount - 1);
 
         if (RubyGuards.isRubyHash(lastArgument)) {
             return lastArgument;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ShouldDestructureNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ShouldDestructureNode.java
@@ -42,7 +42,7 @@ public boolean executeBoolean(VirtualFrame frame) {
         // If the single argument is a RubyArray, destructure
         // TODO(CS): can we not just rely on the respondToCheck? Should experiment.
 
-        if (RubyGuards.isRubyArray(RubyArguments.getArgument(frame.getArguments(), 0))) {
+        if (RubyGuards.isRubyArray(RubyArguments.getArgument(frame, 0))) {
             return true;
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/UnknownArgumentErrorNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/UnknownArgumentErrorNode.java