Handle early exits from ensures. Fixes #237.

rubinius · Mar 31, 2010 · 85c4b76 · 85c4b76
1 parent bc783d6
commit 85c4b76
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 0 deletions.
diff --git a/lib/compiler/ast/exceptions.rb b/lib/compiler/ast/exceptions.rb
@@ -43,13 +43,35 @@ def bytecode(g)
         g.set_stack_local outer_exc_state
         g.pop
 
+        old_break = g.break
+        new_break = g.new_label
+        g.break = new_break
+
         g.state.push_ensure
         @body.bytecode(g)
         g.state.pop_ensure
 
+        g.break = old_break
+
         g.pop_unwind
         g.goto ok
 
+        check_break = nil
+
+        if new_break.used?
+          used_break_local = g.new_stack_local
+          check_break = g.new_label
+
+          new_break.set!
+          g.pop_unwind
+
+          g.push :true
+          g.set_stack_local used_break_local
+          g.pop
+
+          g.goto check_break
+        end
+
         ex.set!
 
         g.push_exception_state
@@ -66,10 +88,33 @@ def bytecode(g)
 
         ok.set!
 
+        if check_break
+          g.push :false
+          g.set_stack_local used_break_local
+          g.pop
+
+          check_break.set!
+        end
+
         # Now, re-emit the code for the ensure which will run if there was no
         # exception generated.
         @ensure.bytecode(g)
         g.pop
+
+        if check_break
+          post = g.new_label
+
+          g.push_stack_local used_break_local
+          g.gif post
+
+          if g.break
+            g.goto g.break
+          else
+            g.raise_break
+          end
+
+          post.set!
+        end
       end
 
       def to_sexp

diff --git a/spec/custom/helpers/generator.rb b/spec/custom/helpers/generator.rb
@@ -668,10 +668,33 @@ def for_ensure
 
       g.save_exception
 
+      old_break = g.break
+      new_break = g.new_label
+      g.break = new_break
+
       eb.body.call
 
+      g.break = old_break
+
       g.pop_unwind
       g.goto ensure_good
+
+      check_break = nil
+
+      if new_break.used?
+        used_break_local = g.new_stack_local
+        check_break = g.new_label
+
+        new_break.set!
+        g.pop_unwind
+
+        g.push :true
+        g.set_stack_local used_break_local
+        g.pop
+
+        g.goto check_break
+      end
+
       ensure_bad.set!
       g.push_exception_state
 
@@ -680,7 +703,31 @@ def for_ensure
       g.reraise
 
       ensure_good.set!
+
+      if check_break
+        g.push :false
+        g.set_stack_local used_break_local
+        g.pop
+
+        check_break.set!
+      end
+
       eb.handler.call
+
+      if check_break
+        post = g.new_label
+
+        g.push_stack_local used_break_local
+        g.gif post
+
+        if g.break
+          g.goto g.break
+        else
+          g.raise_break
+        end
+
+        post.set!
+      end
     end
 
     def optional_arg(slot)