START_MY_CXT
-STATIC SV *a_clone(pTHX_ SV *sv, tTHX owner) {
-#define a_clone(S, O) a_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, ¶m);
-
- if (stashes) {
- av_undef(stashes);
- SvREFCNT_dec(stashes);
- }
-
- return SvREFCNT_inc(dupsv);
-}
+typedef struct {
+ ptable *tbl;
+#if A_HAS_PERL(5, 13, 2)
+ CLONE_PARAMS *params;
+#else
+ CLONE_PARAMS params;
+#endif
+} a_ptable_clone_ud;
+
+#if A_HAS_PERL(5, 13, 2)
+# define a_ptable_clone_ud_init(U, T, O) \
+ (U).tbl = (T); \
+ (U).params = Perl_clone_params_new((O), aTHX)
+# define a_ptable_clone_ud_deinit(U) Perl_clone_params_del((U).params)
+# define a_dup_inc(S, U) SvREFCNT_inc(sv_dup((S), (U)->params))
+#else
+# define a_ptable_clone_ud_init(U, T, O) \
+ (U).tbl = (T); \
+ (U).params.stashes = newAV(); \
+ (U).params.flags = 0; \
+ (U).params.proto_perl = (O)
+# define a_ptable_clone_ud_deinit(U) SvREFCNT_dec((U).params.stashes)
+# define a_dup_inc(S, U) SvREFCNT_inc(sv_dup((S), &((U)->params)))
+#endif
STATIC void a_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
- my_cxt_t *ud = ud_;
+ a_ptable_clone_ud *ud = ud_;
a_hint_t *h1 = ent->val;
a_hint_t *h2;
- if (ud->owner == aTHX)
- return;
-
h2 = PerlMemShared_malloc(sizeof *h2);
h2->bits = h1->bits;
- h2->require_tag = PTR2IV(a_clone(INT2PTR(SV *, h1->require_tag), ud->owner));
+ h2->require_tag = PTR2IV(a_dup_inc(INT2PTR(SV *, h1->require_tag), ud));
ptable_hints_store(ud->tbl, ent->key, h2);
}
STATIC UV a_hint(pTHX) {
#define a_hint() a_hint(aTHX)
SV *hint;
-#if A_HAS_PERL(5, 9, 5)
+#ifdef cop_hints_fetch_pvn
+ hint = cop_hints_fetch_pvn(PL_curcop, __PACKAGE__, __PACKAGE_LEN__, a_hash, 0);
+#elif A_HAS_PERL(5, 9, 5)
hint = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
NULL,
__PACKAGE__, __PACKAGE_LEN__,
MUTEX_LOCK(&a_op_map_mutex);
#endif
- ptable_map_store(a_op_map, o, NULL);
+ ptable_map_delete(a_op_map, o);
#ifdef USE_ITHREADS
MUTEX_UNLOCK(&a_op_map_mutex);
PL_op->op_ppaddr = oi->old_pp;
}
- return CALL_FPTR(oi->old_pp)(aTHX);
+ return oi->old_pp(aTHX);
}
/* ... pp_rv2hv ............................................................ */
PL_op->op_ppaddr = oi->old_pp;
}
- return CALL_FPTR(oi->old_pp)(aTHX);
+ return oi->old_pp(aTHX);
}
STATIC OP *a_pp_rv2hv(pTHX) {
PL_op->op_ppaddr = oi->old_pp;
}
- return CALL_FPTR(oi->old_pp)(aTHX);
+ return oi->old_pp(aTHX);
}
/* ... pp_deref (aelem,helem,rv2sv,padsv) .................................. */
deref:
old_private = PL_op->op_private;
PL_op->op_private = ((old_private & ~OPpDEREF) | OPpLVAL_DEFER);
- o = CALL_FPTR(oi->old_pp)(aTHX);
+ o = oi->old_pp(aTHX);
PL_op->op_private = old_private;
if (flags & (A_HINT_NOTIFY|A_HINT_STORE)) {
* state. */
PL_op->op_ppaddr = oi->old_pp;
- return CALL_FPTR(oi->old_pp)(aTHX);
+ return oi->old_pp(aTHX);
}
/* ... pp_root (exists,delete,keys,values) ................................. */
{
dA_MAP_THX;
const a_op_info *oi = a_map_fetch(PL_op);
- return CALL_FPTR(oi->old_pp)(aTHX);
+ return oi->old_pp(aTHX);
}
}
{
dA_MAP_THX;
const a_op_info *oi = a_map_fetch(PL_op);
- return CALL_FPTR(oi->old_pp)(aTHX);
+ return oi->old_pp(aTHX);
}
}
a_pp_padsv_restore(o);
- o = CALL_FPTR(a_old_ck_padany)(aTHX_ o);
+ o = a_old_ck_padany(aTHX_ o);
hint = a_hint();
if (hint & A_HINT_DO) {
a_pp_padsv_restore(o);
- o = CALL_FPTR(a_old_ck_padsv)(aTHX_ o);
+ o = a_old_ck_padsv(aTHX_ o);
hint = a_hint();
if (hint & A_HINT_DO) {
old_ck = a_old_ck_rv2sv;
break;
}
- o = CALL_FPTR(old_ck)(aTHX_ o);
+ o = old_ck(aTHX_ o);
if (hint & A_HINT_DO) {
a_map_store_root(o, o->op_ppaddr, hint);
case OP_RV2AV: old_ck = a_old_ck_rv2av; new_pp = a_pp_rv2av; break;
case OP_RV2HV: old_ck = a_old_ck_rv2hv; new_pp = a_pp_rv2hv_simple; break;
}
- o = CALL_FPTR(old_ck)(aTHX_ o);
+ o = old_ck(aTHX_ o);
if (cUNOPo->op_first->op_type == OP_GV)
return o;
a_recheck_rv2xv(cUNOPo->op_first->op_sibling, OP_RV2HV, a_pp_rv2hv);
break;
}
- o = CALL_FPTR(old_ck)(aTHX_ o);
+ o = old_ck(aTHX_ o);
if (hint & A_HINT_DO) {
a_map_store_root(o, 0, hint);
enabled = hint & A_HINT_FETCH;
break;
}
- o = CALL_FPTR(old_ck)(aTHX_ o);
+ o = old_ck(aTHX_ o);
if (hint & A_HINT_DO) {
if (enabled) {
ptable *t;
PPCODE:
{
- my_cxt_t ud;
+ a_ptable_clone_ud ud;
dMY_CXT;
- ud.tbl = t = ptable_new();
- ud.owner = MY_CXT.owner;
+
+ t = ptable_new();
+ a_ptable_clone_ud_init(ud, t, MY_CXT.owner);
ptable_walk(MY_CXT.tbl, a_ptable_clone, &ud);
+ a_ptable_clone_ud_deinit(ud);
}
{
MY_CXT_CLONE;