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

Commits on Oct 21, 2014

  1. Clean up imports.

    @headius
    headius committed Oct 21, 2014
    Copy the full SHA
    cbdf7fc View commit details

  2. Determine closure's containing module at construct time (for JIT).

    @headius
    headius committed Oct 21, 2014
    Copy the full SHA
    ea968a0 View commit details
Showing with 3 additions and 7 deletions.
  1. +0 −7 core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
  2. +3 −0 core/src/main/java/org/jruby/runtime/CompiledIRBlockBody.java
7 changes: 0 additions & 7 deletions core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@
import org.jruby.*;
import org.jruby.compiler.impl.SkinnyMethodAdapter;
import org.jruby.internal.runtime.GlobalVariables;
import org.jruby.internal.runtime.methods.CompiledIRMetaClassBody;
import org.jruby.internal.runtime.methods.CompiledIRMethod;
import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.ir.*;
import org.jruby.ir.instructions.*;
@@ -1749,11 +1747,6 @@ public void RestoreErrorInfoInstr(RestoreErrorInfoInstr restoreerrorinfoinstr) {
// ruby 1.9 specific
@Override
public void BuildLambdaInstr(BuildLambdaInstr buildlambdainstr) {
// SSS FIXME: Copied this from ast/LambdaNode ... Is this required here as well?
//
// JRUBY-5686: do this before executing so first time sets cref module
// getLambdaBody().getClosure().getStaticScope().determineModule();

jvmMethod().loadRuntime();

IRClosure body = ((WrappedIRClosure)buildlambdainstr.getLambdaBody()).getClosure();
3 changes: 3 additions & 0 deletions core/src/main/java/org/jruby/runtime/CompiledIRBlockBody.java
View file
Original file line number Diff line number Diff line change
@@ -24,6 +24,9 @@ public CompiledIRBlockBody(MethodHandle handle, IRScope closure, int arity) {
this.closure = (IRClosure)closure;
this.pushScope = true;
this.reuseParentScope = false;

// Done in the interpreter (WrappedIRClosure) but we do it here
closure.getStaticScope().determineModule();
}

protected IRubyObject commonYieldPath(ThreadContext context, IRubyObject[] args, IRubyObject self, Binding binding, Type type, Block block) {