add new function mrb_toplevel_run to prevent running through C function boudaries on exceptions; close #1942

1 files changed, 17 insertions, 0 deletions

diff --git a/src/vm.c b/src/vm.c
index 8504cc34c..505f3f955 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -2270,3 +2270,20 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
 {
   return mrb_context_run(mrb, proc, self, mrb->c->ci->argc + 2); /* argc + 2 (receiver and block) */
 }
+
+mrb_value
+mrb_toplevel_run(mrb_state *mrb, struct RProc *proc)
+{
+  mrb_callinfo *ci;
+  mrb_value v;
+
+  if (!mrb->c->cibase || mrb->c->ci == mrb->c->cibase) {
+    return mrb_context_run(mrb, proc, mrb_top_self(mrb), 0);
+  }
+  ci = cipush(mrb);
+  ci->acc = CI_ACC_SKIP;
+  v = mrb_context_run(mrb, proc, mrb_top_self(mrb), 0);
+  cipop(mrb);
+
+  return v;
+}