Merge pull request #6260 from dearblue/mrb_vm_exec-exception

Remove `exc_caught` from `mrb_vm_exec()`
mruby · May 6, 2024 · f975794 · f975794
2 parents 1e61a87 + dea5c9e
commit f975794
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/vm.c b/src/vm.c
@@ -1432,15 +1432,13 @@ mrb_vm_exec(mrb_state *mrb, const struct RProc *proc, const mrb_code *pc)
   };
 #endif
 
-  volatile mrb_bool exc_caught = FALSE;
 RETRY_TRY_BLOCK:
 
   MRB_TRY(&c_jmp) {
 
-  if (exc_caught) {
-    exc_caught = FALSE;
+  if (mrb->exc) {
     mrb_gc_arena_restore(mrb, ai);
-    if (mrb->exc && mrb->exc->tt == MRB_TT_BREAK)
+    if (mrb->exc->tt == MRB_TT_BREAK)
       goto L_BREAK;
     goto L_RAISE;
   }
@@ -3130,7 +3128,6 @@ mrb_vm_exec(mrb_state *mrb, const struct RProc *proc, const mrb_code *pc)
     while (ci > mrb->c->cibase && ci->cci == CINFO_DIRECT) {
       ci = cipop(mrb);
     }
-    exc_caught = TRUE;
     pc = ci->pc;
     goto RETRY_TRY_BLOCK;
   }