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

Commits on Oct 13, 2014

  1. Remove closure-clearing line from prepare.

    @headius
    headius committed Oct 13, 2014
    Copy the full SHA
    e6931d9 View commit details

  2. Missing a result save for const missing.

    @headius
    headius committed Oct 13, 2014
    Copy the full SHA
    98c943f View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −1 core/src/main/java/org/jruby/ir/IRScope.java
  2. +1 −0 core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ir/IRScope.java
View file
Original file line number Diff line number Diff line change
@@ -475,7 +475,7 @@ private synchronized Instr[] prepareInstructions() {

SimpleCloneInfo cloneInfo = new SimpleCloneInfo(this, false);
// Clear old set
initNestedClosures();
// initNestedClosures();

// FIXME: If CFG (or linearizedBBList) knew number of instrs we could end up allocing better

1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
View file
Original file line number Diff line number Diff line change
@@ -871,6 +871,7 @@ public void ConstMissingInstr(ConstMissingInstr constmissinginstr) {
jvmAdapter().ldc("const_missing");
jvmMethod().pushSymbol(constmissinginstr.getMissingConst());
jvmMethod().invokeVirtual(Type.getType(RubyModule.class), Method.getMethod("org.jruby.runtime.builtin.IRubyObject callMethod(org.jruby.runtime.ThreadContext, java.lang.String, org.jruby.runtime.builtin.IRubyObject)"));
jvmStoreLocal(constmissinginstr.getResult());
}

@Override