Split common stuff

[gitmo/Mouse.git] / xs-src / MouseUtil.xs

diff --git a/xs-src/MouseUtil.xs b/xs-src/MouseUtil.xs
index 5b01e40..2d557a6 100644 (file)
--- a/xs-src/MouseUtil.xs
+++ b/xs-src/MouseUtil.xs
@@ -120,26 +120,28 @@ mouse_throw_error(SV* const metaobject, SV* const data /* not used */, const cha
     }
 }
 
-/* workaround RT #69939 */
+/* workaround Perl-RT #69939 */
 I32
 mouse_call_sv_safe(pTHX_ SV* const sv, I32 const flags) {
-    assert( (flags & G_EVAL) == 0 );
+    I32 count;
+    ENTER;
+    /* Don't do SAVETMPS */
 
-    if(!PL_in_eval) {
-        I32 count;
-        SAVESPTR(ERRSV);
-        ERRSV = sv_newmortal();
+    SAVESPTR(ERRSV);
+    ERRSV = sv_newmortal();
 
-        count = Perl_call_sv(aTHX_ sv, flags | G_EVAL);
+    count = Perl_call_sv(aTHX_ sv, flags | G_EVAL);
 
-        if(sv_true(ERRSV)){
-            croak(NULL); /* rethrow */
-        }
-        return count;
-    }
-    else {
-        return Perl_call_sv(aTHX_ sv, flags);
+    if(sv_true(ERRSV)){
+        SV* const err = sv_mortalcopy(ERRSV);
+        LEAVE;
+        sv_setsv(ERRSV, err);
+        croak(NULL); /* rethrow */
     }
+
+    LEAVE;
+
+    return count;
 }
 
 void
@@ -346,7 +348,7 @@ mouse_install_sub(pTHX_ GV* const gv, SV* const code_ref) {
             }
         }
 
-        CvGV(cv) = gv;
+        CvGV_set(cv, gv);
         CvANON_off(cv);
     }
 }