even more context

Author: hauntsaninja

mypyc/irbuild/statement.py

@@ -117,6 +117,7 @@
 from mypyc.primitives.misc_ops import (
     check_stop_op,
     coro_op,
+    debug_print_op,
     import_from_many_op,
     import_many_op,
     import_op,
@@ -1036,16 +1037,21 @@ def try_body() -> None:
     def except_body() -> None:
         exc_original = builder.call_c(get_exc_value_op, [], line)
 
-        builder.py_call(builder.py_get_attr(gen, "throw", line), [], line)
-        err_occurred = builder.call_c(err_occurred_op, [], line)
-
         error_block, no_error_block = BasicBlock(), BasicBlock()
-        builder.add(Branch(err_occurred, error_block, no_error_block, Branch.BOOL))
 
-        builder.activate_block(error_block)
+        builder.builder.push_error_handler(error_block)
+        builder.goto_and_activate(BasicBlock())
+        builder.py_call(builder.py_get_attr(gen, "throw", line), [exc_original], line)
+        builder.goto(no_error_block)
+        builder.builder.pop_error_handler()
+
+        builder.activate_block(no_error_block)
+        builder.add(RaiseStandardError(RaiseStandardError.RUNTIME_ERROR, "generator didn't stop after throw()", line))
+        builder.add(Unreachable())
 
+        builder.activate_block(error_block)
         stop_iteration = builder.call_c(check_stop_op, [], line)
-        is_same_exc = builder.binary_op(stop_iteration, exc_original, "is", line)
+        is_same_exc = builder.binary_op(stop_iteration, exc_original, "==", line)
 
         suppress_block, propagate_block = BasicBlock(), BasicBlock()
         builder.add(Branch(is_same_exc, suppress_block, propagate_block, Branch.BOOL))
@@ -1054,10 +1060,6 @@ def except_body() -> None:
         builder.call_c(keep_propagating_op, [], line)
         builder.add(Unreachable())
 
-        builder.activate_block(no_error_block)
-        builder.add(RaiseStandardError(RaiseStandardError.RUNTIME_ERROR, "generator didn't stop after throw()", line))
-        builder.add(Unreachable())
-
         builder.activate_block(suppress_block)
         builder.call_c(error_clear_op, [], -1)