mPUSHs(newSVpvs("depth"));
mPUSHi(-1);
}
-
PUTBACK;
-
- call_method("throw_error", G_VOID);
+ if(SvOK(metaobject)) {
+ call_method("throw_error", G_VOID);
+ }
+ else {
+ call_pv("Mouse::Util::throw_error", G_VOID);
+ }
croak("throw_error() did not throw the error (%"SVf")", message);
}
}
+/* workaround Perl-RT #69939 */
+I32
+mouse_call_sv_safe(pTHX_ SV* const sv, I32 const flags) {
+ I32 count;
+ ENTER;
+ /* Don't do SAVETMPS */
+
+ SAVESPTR(ERRSV);
+ ERRSV = sv_newmortal();
+
+ count = Perl_call_sv(aTHX_ sv, flags | G_EVAL);
+
+ if(sv_true(ERRSV)){
+ SV* const err = sv_mortalcopy(ERRSV);
+ LEAVE;
+ sv_setsv(ERRSV, err);
+ croak(NULL); /* rethrow */
+ }
+
+ LEAVE;
+
+ return count;
+}
+
void
mouse_must_defined(pTHX_ SV* const value, const char* const name) {
assert(value);
XPUSHs(self);
PUTBACK;
- call_sv(method, G_SCALAR | G_METHOD);
+ call_sv_safe(method, G_SCALAR | G_METHOD);
SPAGAIN;
ret = POPs;
PUSHs(arg1);
PUTBACK;
- call_sv(method, G_SCALAR | G_METHOD);
+ call_sv_safe(method, G_SCALAR | G_METHOD);
SPAGAIN;
ret = POPs;
}
}
- CvGV(cv) = gv;
+ CvGV_set(cv, gv);
CvANON_off(cv);
}
}