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

Commits on Oct 31, 2014

  1. Turn off LocalOptimizationPass for the interpreter 

    * In this experimental way we are building expression trees,
  we build it very early in the pipeline and passes that modify
  instructions by combining instructions, moving operands from
  one instruction to another (as the LocalOptimizaionPass does)
  breaks the semantics of the tree in the current form it is
  represented.

* So, in the interest of experimenting to see how far this can be
  pushed, turning that off for now.
    @subbuss
    subbuss committed Oct 31, 2014
    Copy the full SHA
    4eae2a6 View commit details

  2. Less verbose toString for TemporaryLocalVariable

    @subbuss
    subbuss committed Oct 31, 2014
    Copy the full SHA
    701181e View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 core/src/main/java/org/jruby/ir/IRManager.java
  2. +1 −1 core/src/main/java/org/jruby/ir/operands/TemporaryLocalVariable.java
4 changes: 2 additions & 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,8 @@
*/
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_COMPILER_PASSES = "OptimizeTempVarsPass";
public static final String DEFAULT_JIT_PASSES = "LocalOptimizationPass,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/operands/TemporaryLocalVariable.java
View file
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ public Object retrieve(ThreadContext context, IRubyObject self, StaticScope curr

@Override
public String toString() {
return getName() + (producer == null ? "-unrecorded-" : "=["+ producer.getOperation() + "]" );
return getName() + (producer == null ? "" : "=["+ producer.getOperation() + "]" );
}

@Override