Fix the refcount of orig_pkg when type_pkg defaults to it

[perl/modules/Lexical-Types.git] / Types.xs

diff --git a/Types.xs b/Types.xs
index 2e8bda47037bcbf9f595dc9f0ae72325831138ea..8895acb0b371904adb1598074aa80724210154e2 100644 (file)
--- a/Types.xs
+++ b/Types.xs
@@ -6,6 +6,9 @@
 #include "perl.h"
 #include "XSUB.h"
 
+#define __PACKAGE__     "Lexical::Types"
+#define __PACKAGE_LEN__ (sizeof(__PACKAGE__)-1)
+
 /* --- Compatibility wrappers ---------------------------------------------- */
 
 #define LT_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
@@ -32,9 +35,6 @@
 # define HvNAMELEN_get(H) strlen(HvNAME_get(H))
 #endif
 
-#define __PACKAGE__     "Lexical::Types"
-#define __PACKAGE_LEN__ (sizeof(__PACKAGE__)-1)
-
 /* --- Helpers ------------------------------------------------------------- */
 
 /* ... Hints ............................................................... */
@@ -103,8 +103,6 @@ STATIC const lt_op_info *lt_map_fetch(pTHX_ const OP *o) {
 
 /* ... Our pp_padsv ........................................................ */
 
-STATIC OP *(*lt_old_pp_padsv)(pTHX) = 0;
-
 STATIC OP *lt_pp_padsv(pTHX) {
  const lt_op_info *oi;
 
@@ -147,7 +145,28 @@ STATIC OP *lt_pp_padsv(pTHX) {
   return CALL_FPTR(oi->pp_padsv)(aTHX);
  }
 
- return CALL_FPTR(lt_old_pp_padsv)(aTHX);
+ return CALL_FPTR(PL_ppaddr[OP_PADSV])(aTHX);
+}
+
+STATIC OP *(*lt_pp_padsv_saved)(pTHX) = 0;
+
+STATIC void lt_pp_padsv_save(void) {
+ if (lt_pp_padsv_saved)
+  return;
+
+ lt_pp_padsv_saved   = PL_ppaddr[OP_PADSV];
+ PL_ppaddr[OP_PADSV] = lt_pp_padsv;
+}
+
+STATIC void lt_pp_padsv_restore(OP *o) {
+ if (!lt_pp_padsv_saved)
+  return;
+
+ if (o->op_ppaddr == lt_pp_padsv)
+  o->op_ppaddr = lt_pp_padsv_saved;
+
+ PL_ppaddr[OP_PADSV] = lt_pp_padsv_saved;
+ lt_pp_padsv_saved   = 0;
 }
 
 /* ... Our ck_pad{any,sv} .................................................. */
@@ -168,7 +187,7 @@ STATIC OP *lt_ck_padany(pTHX_ OP *o) {
  HV *stash;
  SV *hint;
 
- PL_ppaddr[OP_PADSV] = lt_old_pp_padsv;
+ lt_pp_padsv_restore(o);
 
  o = CALL_FPTR(lt_old_ck_padany)(aTHX_ o);
 
@@ -176,8 +195,8 @@ STATIC OP *lt_ck_padany(pTHX_ OP *o) {
  if (stash && (hint = lt_hint())) {
   SV *orig_pkg  = newSVpvn(HvNAME_get(stash), HvNAMELEN_get(stash));
   SV *orig_meth = lt_default_meth;
-  SV *type_pkg  = orig_pkg;
-  SV *type_meth = orig_meth;
+  SV *type_pkg  = NULL;
+  SV *type_meth = NULL;
   SV *code      = INT2PTR(SV *, SvUVX(hint));
 
   SvREADONLY_on(orig_pkg);
@@ -202,7 +221,6 @@ STATIC OP *lt_ck_padany(pTHX_ OP *o) {
     croak(__PACKAGE__ " mangler should return zero, one or two scalars, but got %d", items);
    if (items == 0) {
     SvREFCNT_dec(orig_pkg);
-    SvREFCNT_dec(orig_meth);
     goto skip;
    } else {
     SV *rsv;
@@ -225,12 +243,19 @@ STATIC OP *lt_ck_padany(pTHX_ OP *o) {
    LEAVE;
   }
 
-  if (type_meth == orig_meth)
+  if (!type_pkg) {
+   type_pkg = orig_pkg;
+   SvREFCNT_inc(orig_pkg);
+  }
+
+  if (!type_meth) {
+   type_meth = orig_meth;
    SvREFCNT_inc(orig_meth);
-  lt_map_store(o, orig_pkg, type_pkg, type_meth, lt_old_pp_padsv);
+  }
 
-  lt_old_pp_padsv     = PL_ppaddr[OP_PADSV];
-  PL_ppaddr[OP_PADSV] = lt_pp_padsv;
+  lt_pp_padsv_save();
+
+  lt_map_store(o, orig_pkg, type_pkg, type_meth, lt_pp_padsv_saved);
  }
 
 skip:
@@ -240,7 +265,8 @@ skip:
 STATIC OP *(*lt_old_ck_padsv)(pTHX_ OP *) = 0;
 
 STATIC OP *lt_ck_padsv(pTHX_ OP *o) {
- PL_ppaddr[OP_PADSV] = lt_old_pp_padsv;
+ lt_pp_padsv_restore(o);
+
  return CALL_FPTR(lt_old_ck_padsv)(aTHX_ o);
 }
 
@@ -265,7 +291,6 @@ BOOT:
   PL_check[OP_PADANY] = MEMBER_TO_FPTR(lt_ck_padany);
   lt_old_ck_padsv     = PL_check[OP_PADSV];
   PL_check[OP_PADSV]  = MEMBER_TO_FPTR(lt_ck_padsv);
-  lt_old_pp_padsv     = PL_ppaddr[OP_PADSV];
  }
 }