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

Commits on Jan 9, 2015

  1. Revert "Temporarily disable DCE (again) because of closure var issues." 

    This reverts commit bf71e56.
    @headius
    headius committed Jan 9, 2015
    Copy the full SHA
    fd9ab76 View commit details

  2. Add block operand to operands this instr consumes. Fixes DCE.

    @headius
    headius committed Jan 9, 2015
    Copy the full SHA
    b3dacaa View commit details
Showing with 2 additions and 3 deletions.
  1. +1 −2 core/src/main/java/org/jruby/ir/IRManager.java
  2. +1 −1 core/src/main/java/org/jruby/ir/instructions/ProcessModuleBodyInstr.java
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
@@ -18,8 +18,7 @@
public class IRManager {
public static final String SAFE_COMPILER_PASSES = "";
public static final String DEFAULT_COMPILER_PASSES = "OptimizeTempVarsPass,LocalOptimizationPass";
// public static final String DEFAULT_JIT_PASSES = "DeadCodeElimination,AddLocalVarLoadStoreInstructions,OptimizeDynScopesPass,AddCallProtocolInstructions,EnsureTempsAssigned";
public static final String DEFAULT_JIT_PASSES = "AddLocalVarLoadStoreInstructions,OptimizeDynScopesPass,AddCallProtocolInstructions,EnsureTempsAssigned";
public static final String DEFAULT_JIT_PASSES = "DeadCodeElimination,AddLocalVarLoadStoreInstructions,OptimizeDynScopesPass,AddCallProtocolInstructions,EnsureTempsAssigned";
public static final String DEFAULT_INLINING_COMPILER_PASSES = "LocalOptimizationPass";

private int dummyMetaClassCount = 0;
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ir/instructions/ProcessModuleBodyInstr.java
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ public ProcessModuleBodyInstr(Variable result, Operand moduleBody, Operand block

@Override
public Operand[] getOperands() {
return new Operand[]{moduleBody};
return new Operand[]{moduleBody,block};
}

@Override