jruby · Sep 22, 2014 · Sep 22, 2014
Showing with 6 additions and 5 deletions.

+0 −4 core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java

+0 −1 core/src/main/java/org/jruby/ir/targets/JVMVisitor.java

+6 −0 spec/compiler/general_spec.rb
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java
@@ -135,10 +135,6 @@ protected void pre(ThreadContext context, IRubyObject self, String name, Block b
         context.setCurrentVisibility(getVisibility());
     }
 
-    private IRubyObject callJitted(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
-        return box.actualMethod.call(context, self, clazz, name, args, block);
-    }
-
     public void ensureInstrsReady() {
         // SSS FIXME: Move this out of here to some other place?
         // Prepare method if not yet done so we know if the method has an explicit/implicit call protocol

diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -1512,7 +1512,6 @@ public void ReceiveKeywordRestArgInstr(ReceiveKeywordRestArgInstr instr) {
 
     @Override
     public void ReceiveOptArgInstr(ReceiveOptArgInstr instr) {
-        jvmMethod().loadContext();
         jvmMethod().loadArgs();
         jvmAdapter().pushInt(instr.requiredArgs);
         jvmAdapter().pushInt(instr.preArgs);

diff --git a/spec/compiler/general_spec.rb b/spec/compiler/general_spec.rb
@@ -853,4 +853,10 @@ class JRUBY4925
 
     expect(x).to eq [1,2,3]
   end
+
+  it "compiles optional arguments in a method with toplevel rescue" do
+    x = compile_and_run 'def foo(a = false); raise; rescue; a; end; foo'
+
+    expect(x).to eq false
+  end
 end