X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Types.xs;h=46aa91628eec598ce7bbf3f1e95e8147138b5078;hb=560cde18a2e72b9d674617c7570cd3cafc498779;hp=a560b2df6d7c22e5e1a06755323f2b0b8ed421ea;hpb=cee3105da7f14fb65d736d945f2d9f948da68e92;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/Types.xs b/Types.xs
index a560b2d..46aa916 100644
--- a/Types.xs
+++ b/Types.xs
@@ -124,6 +124,7 @@ typedef struct {
 #if LT_THREADSAFE
  tTHX    owner;
 #endif
+ SV     *default_meth;
  OP *  (*pp_padsv_saved)(pTHX);
 } my_cxt_t;
 
@@ -153,7 +154,7 @@ STATIC SV *lt_clone(pTHX_ SV *sv, tTHX owner) {
   SvREFCNT_dec(stashes);
  }
 
- return dupsv;
+ return SvREFCNT_inc(dupsv);
 }
 
 STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) {
@@ -330,8 +331,8 @@ typedef struct {
  OP *(*pp_padsv)(pTHX);
 } lt_op_info;
 
-STATIC void lt_map_store(pPTBLMS_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) {
-#define lt_map_store(O, OP, TP, TM, PP) lt_map_store(aPTBLMS_ (O), (OP), (TP), (TM), (PP))
+STATIC void lt_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) {
+#define lt_map_store(O, OP, TP, TM, PP) lt_map_store(aTHX_ (O), (OP), (TP), (TM), (PP))
  lt_op_info *oi;
 
 #ifdef USE_ITHREADS
@@ -373,6 +374,9 @@ STATIC void lt_map_store(pPTBLMS_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *t
   oi->orig_pkg_len  = op_len;
   oi->type_pkg_len  = tp_len;
   oi->type_meth_len = tm_len;
+  SvREFCNT_dec(orig_pkg);
+  SvREFCNT_dec(type_pkg);
+  SvREFCNT_dec(type_meth);
  }
 #else /* MULTIPLICITY */
  oi->orig_pkg  = orig_pkg;
@@ -522,8 +526,6 @@ STATIC void lt_pp_padsv_restore(pMY_CXT_ OP *o) {
  * pp_padsv, but much less than if we would have set PL_ppaddr[OP_PADSV]
  * globally. */
 
-STATIC SV *lt_default_meth = NULL;
-
 STATIC OP *(*lt_old_ck_padany)(pTHX_ OP *) = 0;
 
 STATIC OP *lt_ck_padany(pTHX_ OP *o) {
@@ -538,7 +540,7 @@ STATIC OP *lt_ck_padany(pTHX_ OP *o) {
  stash = PL_in_my_stash;
  if (stash && (code = lt_hint())) {
   SV *orig_pkg  = newSVpvn(HvNAME_get(stash), HvNAMELEN_get(stash));
-  SV *orig_meth = lt_default_meth;
+  SV *orig_meth = MY_CXT.default_meth;
   SV *type_pkg  = NULL;
   SV *type_meth = NULL;
   int items;
@@ -638,15 +640,14 @@ BOOT:
   MY_CXT.owner          = aTHX;
 #endif
   MY_CXT.pp_padsv_saved = 0;
+  MY_CXT.default_meth   = newSVpvn("TYPEDSCALAR", 11);
+  SvREADONLY_on(MY_CXT.default_meth);
 
   lt_op_map = ptable_new();
 #ifdef USE_ITHREADS
   MUTEX_INIT(&lt_op_map_mutex);
 #endif
 
-  lt_default_meth = newSVpvn("TYPEDSCALAR", 11);
-  SvREADONLY_on(lt_default_meth);
-
   PERL_HASH(lt_hash, __PACKAGE__, __PACKAGE_LEN__);
 
   lt_old_ck_padany    = PL_check[OP_PADANY];
@@ -667,6 +668,7 @@ PROTOTYPE: DISABLE
 PREINIT:
  ptable *t;
  int    *level;
+ SV     *cloned_default_meth;
 CODE:
  {
   my_cxt_t ud;
@@ -674,12 +676,14 @@ CODE:
   ud.tbl   = t = ptable_new();
   ud.owner = MY_CXT.owner;
   ptable_walk(MY_CXT.tbl, lt_ptable_hints_clone, &ud);
+  cloned_default_meth = lt_clone(MY_CXT.default_meth, MY_CXT.owner);
  }
  {
   MY_CXT_CLONE;
   MY_CXT.tbl            = t;
   MY_CXT.owner          = aTHX;
   MY_CXT.pp_padsv_saved = 0;
+  MY_CXT.default_meth   = cloned_default_meth;
  }
  {
   level = PerlMemShared_malloc(sizeof *level);