X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=xs-src%2FMouseUtil.xs;fp=xs-src%2FMouseUtil.xs;h=c0e1d80dfdc803d049e253b5b6dc1f6cf77b81fd;hp=e56274888ec9e2d365df1d5cff74444e5a479f62;hb=5433f84558b602c30288e7694d7597774ce49313;hpb=1d7d294f575daea3f10963698208eb4a0b813a50

diff --git a/xs-src/MouseUtil.xs b/xs-src/MouseUtil.xs
index e562748..c0e1d80 100644
--- a/xs-src/MouseUtil.xs
+++ b/xs-src/MouseUtil.xs
@@ -120,13 +120,32 @@ mouse_throw_error(SV* const metaobject, SV* const data /* not used */, const cha
     }
 }
 
+static I32
+S_dopoptosub(pTHX_ I32 const startingblock)
+{
+    const PERL_CONTEXT* const cxstk = cxstack;
+    I32 i;
+    for (i = startingblock; i >= 0; i--) {
+        const PERL_CONTEXT* const cx = &cxstk[i];
+
+        switch (CxTYPE(cx)) {
+        case CXt_EVAL:
+        case CXt_SUB:
+        case CXt_FORMAT:
+            return i;
+        }
+    }
+    return i;
+}
+
 /* workaround RT #69939 */
 I32
 mouse_call_sv_safe(pTHX_ SV* const sv, I32 const flags) {
-    const PERL_CONTEXT* const cx = &cxstack[cxstack_ix];
+    const PERL_CONTEXT* const cx = &cxstack[S_dopoptosub(aTHX_ cxstack_ix)];
     assert( (flags & G_EVAL) == 0 );
-    //warn("%d 0x%x 0x%x", (int)cx->cx_type, (int)cx->cx_type, (int)PL_in_eval);
-    if(!(cx->cx_type & (CXt_EVAL|CXp_TRYBLOCK))) {
+
+    //warn("cx_type=0x%02x PL_eval=0x%02x (%"SVf")", (unsigned)cx->cx_type, (unsigned)PL_in_eval, sv);
+    if(!(cx->cx_type & CXp_TRYBLOCK)) {
         I32 count;
         //SAVESPTR(ERRSV);
         //ERRSV = sv_newmortal();