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: 147a7cbcf025
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1889a7b44e05
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 22, 2014

  1. Reduce nil loading during EnsureTemps.

    @headius
    headius committed Oct 22, 2014
    Copy the full SHA
    7c5aa5c View commit details

  2. Bad indexing while building encoded params.

    @headius
    headius committed Oct 22, 2014
    Copy the full SHA
    d8ce9bb View commit details

  3. Get dynscope opto pass enabled and fix up JITed blocks for it.

    @headius
    headius committed Oct 22, 2014
    Copy the full SHA
    1889a7b View commit details
3 changes: 1 addition & 2 deletions core/src/main/java/org/jruby/ir/IRManager.java
View file
Original file line number Diff line number Diff line change
@@ -19,8 +19,7 @@
public class IRManager {
public static String SAFE_COMPILER_PASSES = "";
public static String DEFAULT_COMPILER_PASSES = "OptimizeTempVarsPass,LocalOptimizationPass";
// public static String DEFAULT_JIT_PASSES = "AddLocalVarLoadStoreInstructions,OptimizeDynScopesPass,AddCallProtocolInstructions,EnsureTempsAssigned";
public static String DEFAULT_JIT_PASSES = "AddLocalVarLoadStoreInstructions,AddCallProtocolInstructions,EnsureTempsAssigned";
public static String DEFAULT_JIT_PASSES = "AddLocalVarLoadStoreInstructions,OptimizeDynScopesPass,AddCallProtocolInstructions,EnsureTempsAssigned";
public static String DEFAULT_INLINING_COMPILER_PASSES = "LocalOptimizationPass";

private int dummyMetaClassCount = 0;
9 changes: 8 additions & 1 deletion core/src/main/java/org/jruby/ir/passes/EnsureTempsAssigned.java
View file
Original file line number Diff line number Diff line change
@@ -47,8 +47,15 @@ private void processCFG(CFG cfg) {
}

BasicBlock bb = cfg.getEntryBB();
int index = 0;
TemporaryVariable first = null;
for (TemporaryVariable name : names) {
bb.getInstrs().add(0, new CopyInstr(name, new Nil()));
if (first == null) {
bb.getInstrs().add(index++, new CopyInstr(name, new Nil()));
first = name;
} else {
bb.getInstrs().add(index++, new CopyInstr(name, first));
}
}

// recurse
5 changes: 3 additions & 2 deletions core/src/main/java/org/jruby/runtime/CompiledIRBlockBody.java
View file
Original file line number Diff line number Diff line change
@@ -22,8 +22,9 @@ public CompiledIRBlockBody(MethodHandle handle, IRScope closure, int arity) {
super(closure.getStaticScope(), ((IRClosure)closure).getParameterList(), closure.getFileName(), closure.getLineNumber(), Arity.createArity(arity));
this.handle = handle;
this.closure = (IRClosure)closure;
this.pushScope = true;
this.reuseParentScope = false;
// FIXME: duplicated from InterpreterContext
this.reuseParentScope = closure.getFlags().contains(IRFlags.REUSE_PARENT_DYNSCOPE);
this.pushScope = !closure.getFlags().contains(IRFlags.DYNSCOPE_ELIMINATED) && !this.reuseParentScope;

// Done in the interpreter (WrappedIRClosure) but we do it here
closure.getStaticScope().determineModule();
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/runtime/Helpers.java
View file
Original file line number Diff line number Diff line change
@@ -2798,7 +2798,7 @@ public static String[] irMethodArgsToParameters(List<String[]> argDesc) {
String[] tmp = new String[argDesc.size()];
for (int i = 0; i < tmp.length; i++) {
String[] arg = argDesc.get(i);
String encoded = arg[0].charAt(0) + arg[2];
String encoded = arg[0].charAt(0) + arg[1];
tmp[i] = encoded;
}