Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b9b78846e49d
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e657f19c1332
Choose a head ref
  • 2 commits
  • 9 files changed
  • 1 contributor

Commits on Feb 27, 2016

  1. Copy the full SHA
    b8d38af View commit details
  2. Copy the full SHA
    e657f19 View commit details
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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);
Original file line number Diff line number Diff line change
@@ -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();
Original file line number Diff line number Diff line change
@@ -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);
}

}
Original file line number Diff line number Diff line change
@@ -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();
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
}

This file was deleted.