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: e4092584cd2c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1499bbafdebd
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 7, 2015

  1. Off by one error in proc to interface optimization for 2 and 3 arity … 

    …paths (still missing test)
    @enebo
    enebo committed Jul 7, 2015
    Copy the full SHA
    99e6d3c View commit details

  2. Now that IREvalScriptBody is gone we do not need evalScopeVars anymore

    @enebo
    enebo committed Jul 7, 2015
    Copy the full SHA
    1499bba View commit details
Showing with 2 additions and 7 deletions.
  1. +0 −5 core/src/main/java/org/jruby/ir/IRScope.java
  2. +2 −2 core/src/main/java/org/jruby/javasupport/Java.java
5 changes: 0 additions & 5 deletions core/src/main/java/org/jruby/ir/IRScope.java
View file
Original file line number Diff line number Diff line change
@@ -118,7 +118,6 @@ public abstract class IRScope implements ParseResult {
private TemporaryLocalVariable currentScopeVariable;

Map<String, LocalVariable> localVars;
Map<String, LocalVariable> evalScopeVars;

EnumSet<IRFlags> flags = EnumSet.noneOf(IRFlags.class);

@@ -820,10 +819,6 @@ public LocalVariable getNewLocalVariable(String name, int scopeDepth) {
return lvar;
}

protected void initEvalScopeVariableAllocator(boolean reset) {
if (reset || evalScopeVars == null) evalScopeVars = new HashMap<>();
}

public TemporaryLocalVariable createTemporaryVariable() {
return getNewTemporaryVariable(TemporaryVariableType.LOCAL);
}
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/javasupport/Java.java
View file
Original file line number Diff line number Diff line change
@@ -1151,8 +1151,8 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
final IRubyObject[] newArgs;
switch( args.length ) {
case 1 : newArgs = IRubyObject.NULL_ARRAY; break;
case 2 : newArgs = new IRubyObject[] { args[0] }; break;
case 3 : newArgs = new IRubyObject[] { args[0], args[1] }; break;
case 2 : newArgs = new IRubyObject[] { args[1] }; break;
case 3 : newArgs = new IRubyObject[] { args[1], args[2] }; break;
default : newArgs = new IRubyObject[ args.length - 1 ];
System.arraycopy(args, 1, newArgs, 0, newArgs.length);
}