super should not be called outside of a method; fix #2770

This commit is contained in:
Yukihiro "Matz" Matsumoto
2015-04-27 00:53:08 +09:00
parent b3b6fe3c07
commit bdb9d4d19c
+8 -4
View File
@@ -1222,6 +1222,13 @@ RETRY_TRY_BLOCK:
int a = GETARG_A(i);
int n = GETARG_C(i);
if (mid == 0) {
mrb_value exc;
out_super:
exc = mrb_exc_new_str_lit(mrb, E_NOMETHOD_ERROR, "super called outside of method");
mrb->exc = mrb_obj_ptr(exc);
goto L_RAISE;
}
recv = regs[0];
c = mrb->c->ci->target_class->super;
m = mrb_method_search_vm(mrb, &c, mid);
@@ -1306,10 +1313,7 @@ RETRY_TRY_BLOCK:
else {
struct REnv *e = uvenv(mrb, lv-1);
if (!e) {
mrb_value exc;
exc = mrb_exc_new_str_lit(mrb, E_NOMETHOD_ERROR, "super called outside of method");
mrb->exc = mrb_obj_ptr(exc);
goto L_RAISE;
goto out_super;
}
stack = e->stack + 1;
}