Re: mro status, etc

From: "Brandon Black" <blblack@gmail.com>
Message-ID: <84621a60704301445y37e9b05ey235210a8e5547cc1@mail.gmail.com>

p4raw-id: //depot/perl@31122

1 files changed, 13 insertions, 6 deletions

diff --git a/mg.c b/mg.c
index 21f671adc5..9617767165 100644
--- a/mg.c
+++ b/mg.c
@@ -1529,19 +1529,26 @@ int
 Perl_magic_setisa(pTHX_ SV *sv, MAGIC *mg)
 {
     dVAR;
+    HV* stash;
     PERL_UNUSED_ARG(sv);
 
+    /* Bail out if destruction is going on */
+    if(PL_dirty) return 0;
+
     /* The first case occurs via setisa,
        the second via setisa_elem, which
        calls this same magic */
-    mro_isa_changed_in(
-        GvSTASH(
-            SvTYPE(mg->mg_obj) == SVt_PVGV
-                ? (GV*)mg->mg_obj
-                : (GV*)SvMAGIC(mg->mg_obj)->mg_obj
-        )
+    stash = GvSTASH(
+        SvTYPE(mg->mg_obj) == SVt_PVGV
+            ? (GV*)mg->mg_obj
+            : (GV*)SvMAGIC(mg->mg_obj)->mg_obj
     );
 
+    if(PL_delaymagic)
+        PL_delayedisa = stash;
+    else
+        mro_isa_changed_in(stash);
+
     return 0;
 }