Use cop_hints_fetch_pvn() whenever possible

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

diff --git a/Types.xs b/Types.xs
index 375d771176f12c374f8b84b8fd09a94756d17b0b..8cf501cc631aec3b350d6baa35c57879ed373b4e 100644 (file)
--- a/Types.xs
+++ b/Types.xs
@@ -152,50 +152,47 @@ START_MY_CXT
 
 #if LT_THREADSAFE
 
-STATIC SV *lt_clone(pTHX_ SV *sv, tTHX owner) {
-#define lt_clone(S, O) lt_clone(aTHX_ (S), (O))
- CLONE_PARAMS  param;
- AV           *stashes = NULL;
- SV           *dupsv;
-
- if (SvTYPE(sv) == SVt_PVHV && HvNAME_get(sv))
-  stashes = newAV();
-
- param.stashes    = stashes;
- param.flags      = 0;
- param.proto_perl = owner;
-
- dupsv = sv_dup(sv, &param);
-
- if (stashes) {
-  av_undef(stashes);
-  SvREFCNT_dec(stashes);
- }
-
- return SvREFCNT_inc(dupsv);
-}
+typedef struct {
+ ptable *tbl;
+#if LT_HAS_PERL(5, 13, 2)
+ CLONE_PARAMS *params;
+#else
+ CLONE_PARAMS params;
+#endif
+} lt_ptable_clone_ud;
+
+#if LT_HAS_PERL(5, 13, 2)
+# define lt_ptable_clone_ud_init(U, T, O) \
+   (U).tbl    = (T); \
+   (U).params = Perl_clone_params_new((O), aTHX)
+# define lt_ptable_clone_ud_deinit(U) Perl_clone_params_del((U).params)
+# define lt_dup_inc(S, U)             SvREFCNT_inc(sv_dup((S), (U)->params))
+#else
+# define lt_ptable_clone_ud_init(U, T, O) \
+   (U).tbl               = (T);     \
+   (U).params.stashes    = newAV(); \
+   (U).params.flags      = 0;       \
+   (U).params.proto_perl = (O)
+# define lt_ptable_clone_ud_deinit(U) SvREFCNT_dec((U).params.stashes)
+# define lt_dup_inc(S, U)             SvREFCNT_inc(sv_dup((S), &((U)->params)))
+#endif
 
-STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) {
- my_cxt_t  *ud  = ud_;
+STATIC void lt_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
+ lt_ptable_clone_ud *ud = ud_;
  lt_hint_t *h1 = ent->val;
  lt_hint_t *h2;
 
- if (ud->owner == aTHX)
-  return;
-
 #if LT_HINT_STRUCT
 
- h2       = PerlMemShared_malloc(sizeof *h2);
- h2->code = lt_clone(h1->code, ud->owner);
- SvREFCNT_inc(h2->code);
+ h2              = PerlMemShared_malloc(sizeof *h2);
+ h2->code        = lt_dup_inc(h1->code, ud);
 #if LT_WORKAROUND_REQUIRE_PROPAGATION
- h2->require_tag = PTR2IV(lt_clone(INT2PTR(SV *, h1->require_tag), ud->owner));
+ h2->require_tag = PTR2IV(lt_dup_inc(INT2PTR(SV *, h1->require_tag), ud));
 #endif
 
 #else /*   LT_HINT_STRUCT */
 
- h2 = lt_clone(h1, ud->owner);
- SvREFCNT_inc(h2);
+ h2 = lt_dup_inc(h1, ud);
 
 #endif /* !LT_HINT_STRUCT */
 
@@ -319,7 +316,9 @@ STATIC U32 lt_hash = 0;
 STATIC SV *lt_hint(pTHX) {
 #define lt_hint() lt_hint(aTHX)
  SV *hint;
-#if LT_HAS_PERL(5, 9, 5)
+#ifdef cop_hints_fetch_pvn
+ hint = cop_hints_fetch_pvn(PL_curcop, __PACKAGE__, __PACKAGE_LEN__, lt_hash,0);
+#elif LT_HAS_PERL(5, 9, 5)
  hint = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
                                        NULL,
                                        __PACKAGE__, __PACKAGE_LEN__,
@@ -448,7 +447,7 @@ STATIC void lt_map_delete(pTHX_ const OP *o) {
  MUTEX_LOCK(&lt_op_map_mutex);
 #endif
 
- ptable_map_store(lt_op_map, o, NULL);
+ ptable_map_delete(lt_op_map, o);
 
 #ifdef USE_ITHREADS
  MUTEX_UNLOCK(&lt_op_map_mutex);
@@ -745,12 +744,14 @@ PREINIT:
  SV     *cloned_default_meth;
 PPCODE:
  {
-  my_cxt_t ud;
+  lt_ptable_clone_ud ud;
   dMY_CXT;
-  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);
+
+  t = ptable_new();
+  lt_ptable_clone_ud_init(ud, t, MY_CXT.owner);
+  ptable_walk(MY_CXT.tbl, lt_ptable_clone, &ud);
+  cloned_default_meth = lt_dup_inc(MY_CXT.default_meth, &ud);
+  lt_ptable_clone_ud_deinit(ud);
  }
  {
   MY_CXT_CLONE;