2 files changed, 3 insertions, 1 deletions
diff --git a/src/backtrace.c b/src/backtrace.c
index 392ce4e07..19a54b7e5 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -168,7 +168,7 @@ static mrb_value
 packed_backtrace(mrb_state *mrb)
 {
   struct RData *backtrace;
-  mrb_int ciidx = mrb->c->ci - mrb->c->cibase;
+  ptrdiff_t ciidx = mrb->c->ci - mrb->c->cibase;
   mrb_int len = (ciidx+1)*sizeof(struct backtrace_location);
   void *ptr;
 
diff --git a/src/vm.c b/src/vm.c
index 6070ecba1..b07624488 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1841,6 +1841,7 @@ RETRY_TRY_BLOCK:
             break;
           }
         case OP_R_NORMAL:
+        NORMAL_RETURN:
           if (ci == mrb->c->cibase) {
             if (!mrb->c->prev) { /* toplevel return */
               localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
@@ -1862,6 +1863,7 @@ RETRY_TRY_BLOCK:
           ci = mrb->c->ci;
           break;
         case OP_R_BREAK:
+          if (MRB_PROC_STRICT_P(proc)) goto NORMAL_RETURN;
           if (!proc->env || !MRB_ENV_STACK_SHARED_P(proc->env)) {
             mrb_value exc;