X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=autovivification.xs;h=a8367a0a961e07b2f0b8665f4dec351e0c92e12d;hb=212cf2f8511a55f57224f4e043d2328a1f840693;hp=b6b3c3389dc11d397d23f201c2c25d734b39cf7e;hpb=ddbfd527f4c54458985145aae3a837a8f5868551;p=perl%2Fmodules%2Fautovivification.git diff --git a/autovivification.xs b/autovivification.xs index b6b3c33..a8367a0 100644 --- a/autovivification.xs +++ b/autovivification.xs @@ -21,72 +21,91 @@ #if A_WORKAROUND_REQUIRE_PROPAGATION -typedef struct { - UV bits; - I32 requires; -} a_hint_t; - -STATIC SV *a_tag(pTHX_ UV bits) { -#define a_tag(B) a_tag(aTHX_ (B)) - SV *tag; - a_hint_t h; +#define A_ENCODE_UV(B, U) \ + len = 0; \ + while (len < sizeof(UV)) { \ + (B)[len++] = (U) & 0xFF; \ + (U) >>= 8; \ + } - h.bits = bits; +#define A_DECODE_UV(U, B) \ + len = sizeof(UV); \ + while (len > 0) \ + (U) = ((U) << 8) | (B)[--len]; - { - const PERL_SI *si; - I32 requires = 0; +#if A_WORKAROUND_REQUIRE_PROPAGATION +STATIC UV a_require_tag(pTHX) { +#define a_require_tag() a_require_tag(aTHX) + const PERL_SI *si; - for (si = PL_curstackinfo; si; si = si->si_prev) { - I32 cxix; + for (si = PL_curstackinfo; si; si = si->si_prev) { + I32 cxix; - for (cxix = si->si_cxix; cxix >= 0; --cxix) { - const PERL_CONTEXT *cx = si->si_cxstack + cxix; + for (cxix = si->si_cxix; cxix >= 0; --cxix) { + const PERL_CONTEXT *cx = si->si_cxstack + cxix; - if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_op_type == OP_REQUIRE) - ++requires; - } + if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_op_type == OP_REQUIRE) + return PTR2UV(cx); } - - h.requires = requires; } - return newSVpvn((const char *) &h, sizeof h); + return PTR2UV(NULL); +} +#endif /* A_WORKAROUND_REQUIRE_PROPAGATION */ + +STATIC SV *a_tag(pTHX_ UV bits) { +#define a_tag(B) a_tag(aTHX_ (B)) + SV *hint; + const PERL_SI *si; + UV cxreq; + unsigned char buf[sizeof(UV) * 2]; + STRLEN len; + + cxreq = a_require_tag(); + A_ENCODE_UV(buf, cxreq); + A_ENCODE_UV(buf + sizeof(UV), bits); + hint = newSVpvn(buf, sizeof buf); + SvREADONLY_on(hint); + + return hint; } STATIC UV a_detag(pTHX_ const SV *hint) { #define a_detag(H) a_detag(aTHX_ (H)) - const a_hint_t *h; + const PERL_SI *si; + UV cxreq = 0, bits = 0; + unsigned char *buf; + STRLEN len; if (!(hint && SvOK(hint))) return 0; - h = (const a_hint_t *) SvPVX(hint); - - { - const PERL_SI *si; - I32 requires = 0; - - for (si = PL_curstackinfo; si; si = si->si_prev) { - I32 cxix; + buf = SvPVX(hint); - for (cxix = si->si_cxix; cxix >= 0; --cxix) { - const PERL_CONTEXT *cx = si->si_cxstack + cxix; + A_DECODE_UV(cxreq, buf); + if (a_require_tag() != cxreq) + return 0; - if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_op_type == OP_REQUIRE - && ++requires > h->requires) - return 0; - } - } - } + A_DECODE_UV(bits, buf + sizeof(UV)); - return h->bits; + return bits; } #else /* A_WORKAROUND_REQUIRE_PROPAGATION */ #define a_tag(B) newSVuv(B) -#define a_detag(H) (((H) && SvOK(H)) ? SvUVX(H) : 0) +/* PVs fetched from the hints chain have their SvLEN set to zero, so get the UV + * from a copy. */ +#define a_detag(H) \ + ((H) \ + ? (SvIOK(H) \ + ? SvUVX(H) \ + : (SvPOK(H) \ + ? sv_2uv(SvLEN(H) ? (H) : sv_mortalcopy(H)) \ + : 0 \ + ) \ + ) \ + : 0) #endif /* !A_WORKAROUND_REQUIRE_PROPAGATION */ @@ -102,13 +121,14 @@ STATIC UV a_detag(pTHX_ const SV *hint) { #define A_HINT_MASK (A_HINT_NOTIFY|A_HINT_DO) /* Only used in op flags */ -#define A_HINT_DEREF 64 +#define A_HINT_ROOT 64 +#define A_HINT_DEREF 128 STATIC U32 a_hash = 0; STATIC UV a_hint(pTHX) { #define a_hint() a_hint(aTHX) - const SV *hint; + SV *hint; #if A_HAS_PERL(5, 9, 5) hint = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash, NULL, @@ -128,8 +148,8 @@ STATIC UV a_hint(pTHX) { typedef struct { OP *(*old_pp)(pTHX); - const OP *root; UV flags; + void *next; } a_op_info; #define PTABLE_NAME ptable_map @@ -146,47 +166,54 @@ STATIC ptable *a_op_map = NULL; STATIC perl_mutex a_op_map_mutex; #endif -STATIC void a_map_store(pPTBLMS_ const OP *o, OP *(*old_pp)(pTHX), UV flags) { -#define a_map_store(O, PP, F) a_map_store(aPTBLMS_ (O), (PP), (F)) - a_op_info *oi; +STATIC const a_op_info *a_map_fetch(const OP *o, a_op_info *oi) { + const a_op_info *val; #ifdef USE_ITHREADS MUTEX_LOCK(&a_op_map_mutex); #endif + val = ptable_fetch(a_op_map, o); + if (val) { + *oi = *val; + val = oi; + } + +#ifdef USE_ITHREADS + MUTEX_UNLOCK(&a_op_map_mutex); +#endif + + return val; +} + +STATIC const a_op_info *a_map_store_locked(pPTBLMS_ const OP *o, OP *(*old_pp)(pTHX), void *next, UV flags) { +#define a_map_store_locked(O, PP, N, F) a_map_store_locked(aPTBLMS_ (O), (PP), (N), (F)) + a_op_info *oi; + if (!(oi = ptable_fetch(a_op_map, o))) { oi = PerlMemShared_malloc(sizeof *oi); ptable_map_store(a_op_map, o, oi); } oi->old_pp = old_pp; - oi->root = NULL; + oi->next = next; oi->flags = flags; -#ifdef USE_ITHREADS - MUTEX_UNLOCK(&a_op_map_mutex); -#endif + return oi; } -STATIC const a_op_info *a_map_fetch(const OP *o, a_op_info *oi) { - const a_op_info *val; +STATIC void a_map_store(pPTBLMS_ const OP *o, OP *(*old_pp)(pTHX), void *next, UV flags) { +#define a_map_store(O, PP, N, F) a_map_store(aPTBLMS_ (O), (PP), (N), (F)) #ifdef USE_ITHREADS MUTEX_LOCK(&a_op_map_mutex); #endif - val = ptable_fetch(a_op_map, o); - if (val) { - *oi = *val; - val = oi; - } else - oi->old_pp = 0; + a_map_store_locked(o, old_pp, next, flags); #ifdef USE_ITHREADS MUTEX_UNLOCK(&a_op_map_mutex); #endif - - return val; } STATIC void a_map_delete(pTHX_ const OP *o) { @@ -202,7 +229,24 @@ STATIC void a_map_delete(pTHX_ const OP *o) { #endif } -STATIC void a_map_set_root(const OP *root, UV flags) { +STATIC const OP *a_map_descend(const OP *o) { + switch (PL_opargs[o->op_type] & OA_CLASS_MASK) { + case OA_BASEOP: + case OA_UNOP: + case OA_BINOP: + case OA_BASEOP_OR_UNOP: + return cUNOPo->op_first; + case OA_LIST: + case OA_LISTOP: + return cLISTOPo->op_last; + } + + return NULL; +} + +STATIC void a_map_store_root(pPTBLMS_ const OP *root, OP *(*old_pp)(pTHX), UV flags) { +#define a_map_store_root(R, PP, F) a_map_store_root(aPTBLMS_ (R), (PP), (F)) + const a_op_info *roi; a_op_info *oi; const OP *o = root; @@ -210,19 +254,110 @@ STATIC void a_map_set_root(const OP *root, UV flags) { MUTEX_LOCK(&a_op_map_mutex); #endif - while (o) { - if (oi = ptable_fetch(a_op_map, o)) { - oi->root = root; - oi->flags = flags; + roi = a_map_store_locked(o, old_pp, (OP *) root, flags | A_HINT_ROOT); + + while (o->op_flags & OPf_KIDS) { + o = a_map_descend(o); + if (!o) + break; + if ((oi = ptable_fetch(a_op_map, o))) { + oi->flags &= ~A_HINT_ROOT; + oi->next = (a_op_info *) roi; + break; } + } + +#ifdef USE_ITHREADS + MUTEX_UNLOCK(&a_op_map_mutex); +#endif + + return; +} + +STATIC void a_map_update_flags_topdown(const OP *root, UV flags) { + a_op_info *oi; + const OP *o = root; + +#ifdef USE_ITHREADS + MUTEX_LOCK(&a_op_map_mutex); +#endif + + flags &= ~A_HINT_ROOT; + + do { + if ((oi = ptable_fetch(a_op_map, o))) + oi->flags = (oi->flags & A_HINT_ROOT) | flags; if (!(o->op_flags & OPf_KIDS)) break; - o = cUNOPo->op_first; + o = a_map_descend(o); + } while (o); + +#ifdef USE_ITHREADS + MUTEX_UNLOCK(&a_op_map_mutex); +#endif + + return; +} + +#define a_map_cancel(R) a_map_update_flags_topdown((R), 0) + +STATIC void a_map_update_flags_bottomup(const OP *o, UV flags, UV rflags) { + a_op_info *oi; + +#ifdef USE_ITHREADS + MUTEX_LOCK(&a_op_map_mutex); +#endif + + flags &= ~A_HINT_ROOT; + rflags |= A_HINT_ROOT; + + oi = ptable_fetch(a_op_map, o); + while (!(oi->flags & A_HINT_ROOT)) { + oi->flags = flags; + oi = oi->next; } + oi->flags = rflags; #ifdef USE_ITHREADS MUTEX_UNLOCK(&a_op_map_mutex); #endif + + return; +} + +/* ... Decide whether this expression should be autovivified or not ........ */ + +STATIC UV a_map_resolve(const OP *o, a_op_info *oi) { + UV flags = 0, rflags; + const OP *root; + a_op_info *roi = oi; + + while (!(roi->flags & A_HINT_ROOT)) + roi = roi->next; + if (!roi) + goto cancel; + + rflags = roi->flags & ~A_HINT_ROOT; + if (!rflags) + goto cancel; + + root = roi->next; + if (root->op_flags & OPf_MOD) { + if (rflags & A_HINT_STORE) + flags = (A_HINT_STORE|A_HINT_DEREF); + } else if (rflags & A_HINT_FETCH) + flags = (A_HINT_FETCH|A_HINT_DEREF); + + if (!flags) { +cancel: + a_map_update_flags_bottomup(o, 0, 0); + return 0; + } + + flags |= (rflags & A_HINT_NOTIFY); + a_map_update_flags_bottomup(o, flags, 0); + + return oi->flags & A_HINT_ROOT ? 0 : flags; } /* ... Lightweight pp_defined() ............................................ */ @@ -251,45 +386,77 @@ STATIC bool a_defined(pTHX_ SV *sv) { /* --- PP functions -------------------------------------------------------- */ +/* Be aware that we restore PL_op->op_ppaddr from the pointer table old_pp + * value, another extension might have saved our pp replacement as the ppaddr + * for this op, so this doesn't ensure that our function will never be called + * again. That's why we don't remove the op info from our map, so that it can + * still run correctly if required. */ + /* ... pp_rv2av ............................................................ */ STATIC OP *a_pp_rv2av(pTHX) { a_op_info oi; - UV hint; + UV flags; dSP; - if (!SvOK(TOPs)) { - /* We always need to push an empty array to fool the pp_aelem() that comes - * later. */ - SV *av; - POPs; - av = sv_2mortal((SV *) newAV()); - PUSHs(av); - RETURN; - } - a_map_fetch(PL_op, &oi); + flags = oi.flags; + + if (flags & A_HINT_DEREF) { + if (!SvOK(TOPs)) { + /* We always need to push an empty array to fool the pp_aelem() that comes + * later. */ + SV *av; + POPs; + av = sv_2mortal((SV *) newAV()); + PUSHs(av); + RETURN; + } + } else { + PL_op->op_ppaddr = oi.old_pp; + } return CALL_FPTR(oi.old_pp)(aTHX); } /* ... pp_rv2hv ............................................................ */ +STATIC OP *a_pp_rv2hv_simple(pTHX) { + a_op_info oi; + UV flags; + dSP; + + a_map_fetch(PL_op, &oi); + flags = oi.flags; + + if (flags & A_HINT_DEREF) { + if (!SvOK(TOPs)) + RETURN; + } else { + PL_op->op_ppaddr = oi.old_pp; + } + + return CALL_FPTR(oi.old_pp)(aTHX); +} + STATIC OP *a_pp_rv2hv(pTHX) { a_op_info oi; - UV hint; + UV flags; dSP; a_map_fetch(PL_op, &oi); + flags = oi.flags; - if (!SvOK(TOPs)) { - if (oi.root->op_flags & OPf_MOD) { + if (flags & A_HINT_DEREF) { + if (!SvOK(TOPs)) { SV *hv; POPs; hv = sv_2mortal((SV *) newHV()); PUSHs(hv); + RETURN; } - RETURN; + } else { + PL_op->op_ppaddr = oi.old_pp; } return CALL_FPTR(oi.old_pp)(aTHX); @@ -297,9 +464,6 @@ STATIC OP *a_pp_rv2hv(pTHX) { /* ... pp_deref (aelem,helem,rv2sv,padsv) .................................. */ -STATIC const char a_msg_forbidden[] = "Reference vivification forbidden"; -STATIC const char a_msg_impossible[] = "Can't vivify reference"; - STATIC OP *a_pp_deref(pTHX) { a_op_info oi; UV flags; @@ -322,49 +486,55 @@ deref: SPAGAIN; if (!SvOK(TOPs)) { if (flags & A_HINT_STRICT) - croak(a_msg_forbidden); + croak("Reference vivification forbidden"); else if (flags & A_HINT_WARN) - warn(a_msg_forbidden); + warn("Reference was vivified"); else /* A_HINT_STORE */ - croak(a_msg_impossible); + croak("Can't vivify reference"); } } return o; - } else if (flags && (PL_op->op_private & OPpDEREF || PL_op == oi.root)) { - oi.flags = flags & A_HINT_NOTIFY; + } else if ((flags & ~A_HINT_ROOT) + && (PL_op->op_private & OPpDEREF || flags & A_HINT_ROOT)) { + /* Decide if the expression must autovivify or not. + * This branch should be called only once by expression. */ + flags = a_map_resolve(PL_op, &oi); + + /* We need the updated flags value in the deref branch. */ + if (flags & A_HINT_DEREF) + goto deref; + } - if ((oi.root->op_flags & (OPf_MOD|OPf_REF)) != (OPf_MOD|OPf_REF)) { - if (flags & A_HINT_FETCH) - oi.flags |= (A_HINT_FETCH|A_HINT_DEREF); - } else if (flags & A_HINT_STORE) - oi.flags |= (A_HINT_STORE|A_HINT_DEREF); + /* This op doesn't need to skip autovivification, so restore the original + * state. */ + PL_op->op_ppaddr = oi.old_pp; - if (PL_op == oi.root) - oi.flags &= ~A_HINT_DEREF; + return CALL_FPTR(oi.old_pp)(aTHX); +} - /* We will need the updated flags value in the deref part */ - flags = oi.flags; +/* ... pp_root (exists,delete,keys,values) ................................. */ - if (flags & A_HINT_DEREF) - goto deref; +STATIC OP *a_pp_root_unop(pTHX) { + a_op_info oi; + dSP; - /* This op doesn't need to skip autovivification, so restore the original - * state. Be aware that another extension might have saved a_pp_deref as the - * ppaddr for this op, so restoring PL_op->op_ppaddr doesn't ensure that this - * function will never be called again. That's why we don't remove the op info - * from our map and we reset oi.flags to 0, so that it can still run correctly - * if required. */ - oi.flags = 0; - PL_op->op_ppaddr = oi.old_pp; + if (!a_defined(TOPs)) { + POPs; + /* Can only be reached by keys or values */ + if (GIMME_V == G_SCALAR) { + dTARGET; + PUSHi(0); + } + RETURN; } + a_map_fetch(PL_op, &oi); + return CALL_FPTR(oi.old_pp)(aTHX); } -/* ... pp_root (exists,delete) ............................................. */ - -STATIC OP *a_pp_root(pTHX) { +STATIC OP *a_pp_root_binop(pTHX) { a_op_info oi; dSP; @@ -384,6 +554,20 @@ STATIC OP *a_pp_root(pTHX) { /* --- Check functions ----------------------------------------------------- */ +STATIC void a_recheck_rv2xv(pTHX_ OP *o, OPCODE type, OP *(*new_pp)(pTHX)) { +#define a_recheck_rv2xv(O, T, PP) a_recheck_rv2xv(aTHX_ (O), (T), (PP)) + a_op_info oi; + + if (o->op_type == type && o->op_ppaddr != new_pp + && cUNOPo->op_first->op_type != OP_GV + && a_map_fetch(o, &oi)) { + a_map_store(o, o->op_ppaddr, oi.next, oi.flags); + o->op_ppaddr = new_pp; + } + + return; +} + /* ... ck_pad{any,sv} ...................................................... */ /* Sadly, the PADSV OPs we are interested in don't trigger the padsv check @@ -427,7 +611,7 @@ STATIC OP *a_ck_padany(pTHX_ OP *o) { hint = a_hint(); if (hint & A_HINT_DO) { a_pp_padsv_save(); - a_map_store(o, a_pp_padsv_saved, hint); + a_map_store_root(o, a_pp_padsv_saved, hint); } else a_map_delete(o); @@ -445,7 +629,7 @@ STATIC OP *a_ck_padsv(pTHX_ OP *o) { hint = a_hint(); if (hint & A_HINT_DO) { - a_map_store(o, o->op_ppaddr, hint); + a_map_store_root(o, o->op_ppaddr, hint); o->op_ppaddr = a_pp_deref; } else a_map_delete(o); @@ -455,74 +639,163 @@ STATIC OP *a_ck_padsv(pTHX_ OP *o) { /* ... ck_deref (aelem,helem,rv2sv) ........................................ */ +/* Those ops appear both at the root and inside an expression but there's no + * way to distinguish both situations. Worse, we can't even know if we are in a + * modifying context, so the expression can't be resolved yet. It will be at the + * first invocation of a_pp_deref() for this expression. */ + STATIC OP *(*a_old_ck_aelem)(pTHX_ OP *) = 0; STATIC OP *(*a_old_ck_helem)(pTHX_ OP *) = 0; STATIC OP *(*a_old_ck_rv2sv)(pTHX_ OP *) = 0; STATIC OP *a_ck_deref(pTHX_ OP *o) { OP * (*old_ck)(pTHX_ OP *o) = 0; + UV hint = a_hint(); + + switch (o->op_type) { + case OP_AELEM: + old_ck = a_old_ck_aelem; + if ((hint & A_HINT_DO) && !(hint & A_HINT_STRICT)) + a_recheck_rv2xv(cUNOPo->op_first, OP_RV2AV, a_pp_rv2av); + break; + case OP_HELEM: + old_ck = a_old_ck_helem; + if ((hint & A_HINT_DO) && !(hint & A_HINT_STRICT)) + a_recheck_rv2xv(cUNOPo->op_first, OP_RV2HV, a_pp_rv2hv_simple); + break; + case OP_RV2SV: + old_ck = a_old_ck_rv2sv; + break; + } + o = CALL_FPTR(old_ck)(aTHX_ o); + + if (hint & A_HINT_DO) { + a_map_store_root(o, o->op_ppaddr, hint); + o->op_ppaddr = a_pp_deref; + } else + a_map_delete(o); + + return o; +} + +/* ... ck_rv2xv (rv2av,rv2hv) .............................................. */ + +/* Those ops also appear both inisde and at the root, hence the caveats for + * a_ck_deref() still apply here. Since a padsv/rv2sv must appear before a + * rv2[ah]v, resolution is handled by the first call to a_pp_deref() in the + * expression. */ + +STATIC OP *(*a_old_ck_rv2av)(pTHX_ OP *) = 0; +STATIC OP *(*a_old_ck_rv2hv)(pTHX_ OP *) = 0; + +STATIC OP *a_ck_rv2xv(pTHX_ OP *o) { + OP * (*old_ck)(pTHX_ OP *o) = 0; + OP * (*new_pp)(pTHX) = 0; UV hint; switch (o->op_type) { - case OP_AELEM: old_ck = a_old_ck_aelem; break; - case OP_HELEM: old_ck = a_old_ck_helem; break; - case OP_RV2SV: old_ck = a_old_ck_rv2sv; break; + 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); + if (cUNOPo->op_first->op_type == OP_GV) + return o; + hint = a_hint(); + if (hint & A_HINT_DO && !(hint & A_HINT_STRICT)) { + a_map_store_root(o, o->op_ppaddr, hint); + o->op_ppaddr = new_pp; + } else + a_map_delete(o); + + return o; +} + +/* ... ck_xslice (aslice,hslice) ........................................... */ + +/* I think those are only found at the root, but there's nothing that really + * prevent them to be inside the expression too. We only need to update the + * root so that the rest of the expression will see the right context when + * resolving. That's why we don't replace the ppaddr. */ + +STATIC OP *(*a_old_ck_aslice)(pTHX_ OP *) = 0; +STATIC OP *(*a_old_ck_hslice)(pTHX_ OP *) = 0; + +STATIC OP *a_ck_xslice(pTHX_ OP *o) { + OP * (*old_ck)(pTHX_ OP *o) = 0; + UV hint = a_hint(); + + switch (o->op_type) { + case OP_ASLICE: + old_ck = a_old_ck_aslice; + break; + case OP_HSLICE: + old_ck = a_old_ck_hslice; + if (hint & A_HINT_DO) + a_recheck_rv2xv(cUNOPo->op_first->op_sibling, OP_RV2HV, a_pp_rv2hv); + break; + } + o = CALL_FPTR(old_ck)(aTHX_ o); + if (hint & A_HINT_DO) { - if (!(hint & A_HINT_STRICT) && o->op_flags & OPf_KIDS) { - OP *kid = cUNOPo->op_first; - switch (kid->op_type) { - case OP_RV2AV: - a_map_store(kid, kid->op_ppaddr, hint); - kid->op_ppaddr = a_pp_rv2av; - break; - case OP_RV2HV: - a_map_store(kid, kid->op_ppaddr, hint); - kid->op_ppaddr = a_pp_rv2hv; - break; - } - } - a_map_store(o, o->op_ppaddr, hint); - o->op_ppaddr = a_pp_deref; - a_map_set_root(o, hint); + a_map_store_root(o, 0, hint); } else a_map_delete(o); return o; } -/* ... ck_root (exists,delete) ............................................. */ +/* ... ck_root (exists,delete,keys,values) ................................. */ + +/* Those ops are only found at the root of a dereferencing expression. We can + * then resolve at compile time if vivification must take place or not. */ STATIC OP *(*a_old_ck_exists)(pTHX_ OP *) = 0; STATIC OP *(*a_old_ck_delete)(pTHX_ OP *) = 0; +STATIC OP *(*a_old_ck_keys) (pTHX_ OP *) = 0; +STATIC OP *(*a_old_ck_values)(pTHX_ OP *) = 0; STATIC OP *a_ck_root(pTHX_ OP *o) { OP * (*old_ck)(pTHX_ OP *o) = 0; + OP * (*new_pp)(pTHX) = 0; bool enabled = FALSE; UV hint = a_hint(); switch (o->op_type) { case OP_EXISTS: old_ck = a_old_ck_exists; + new_pp = a_pp_root_binop; enabled = hint & A_HINT_EXISTS; break; case OP_DELETE: old_ck = a_old_ck_delete; + new_pp = a_pp_root_binop; enabled = hint & A_HINT_DELETE; break; + case OP_KEYS: + old_ck = a_old_ck_keys; + new_pp = a_pp_root_unop; + enabled = hint & A_HINT_FETCH; + break; + case OP_VALUES: + old_ck = a_old_ck_values; + new_pp = a_pp_root_unop; + enabled = hint & A_HINT_FETCH; + break; } o = CALL_FPTR(old_ck)(aTHX_ o); - if (enabled) { - a_map_set_root(o, hint | A_HINT_DEREF); - a_map_store(o, o->op_ppaddr, hint); - o->op_ppaddr = a_pp_root; - } else { - a_map_set_root(o, 0); - } + if (hint & A_HINT_DO) { + if (enabled) { + a_map_update_flags_topdown(o, hint | A_HINT_DEREF); + a_map_store_root(o, o->op_ppaddr, hint); + o->op_ppaddr = new_pp; + } else { + a_map_cancel(o); + } + } else + a_map_delete(o); return o; } @@ -551,16 +824,32 @@ BOOT: PL_check[OP_PADANY] = MEMBER_TO_FPTR(a_ck_padany); a_old_ck_padsv = PL_check[OP_PADSV]; PL_check[OP_PADSV] = MEMBER_TO_FPTR(a_ck_padsv); + a_old_ck_aelem = PL_check[OP_AELEM]; PL_check[OP_AELEM] = MEMBER_TO_FPTR(a_ck_deref); a_old_ck_helem = PL_check[OP_HELEM]; PL_check[OP_HELEM] = MEMBER_TO_FPTR(a_ck_deref); a_old_ck_rv2sv = PL_check[OP_RV2SV]; PL_check[OP_RV2SV] = MEMBER_TO_FPTR(a_ck_deref); + + a_old_ck_rv2av = PL_check[OP_RV2AV]; + PL_check[OP_RV2AV] = MEMBER_TO_FPTR(a_ck_rv2xv); + a_old_ck_rv2hv = PL_check[OP_RV2HV]; + PL_check[OP_RV2HV] = MEMBER_TO_FPTR(a_ck_rv2xv); + + a_old_ck_aslice = PL_check[OP_ASLICE]; + PL_check[OP_ASLICE] = MEMBER_TO_FPTR(a_ck_xslice); + a_old_ck_hslice = PL_check[OP_HSLICE]; + PL_check[OP_HSLICE] = MEMBER_TO_FPTR(a_ck_xslice); + a_old_ck_exists = PL_check[OP_EXISTS]; PL_check[OP_EXISTS] = MEMBER_TO_FPTR(a_ck_root); a_old_ck_delete = PL_check[OP_DELETE]; PL_check[OP_DELETE] = MEMBER_TO_FPTR(a_ck_root); + a_old_ck_keys = PL_check[OP_KEYS]; + PL_check[OP_KEYS] = MEMBER_TO_FPTR(a_ck_root); + a_old_ck_values = PL_check[OP_VALUES]; + PL_check[OP_VALUES] = MEMBER_TO_FPTR(a_ck_root); stash = gv_stashpvn(__PACKAGE__, __PACKAGE_LEN__, 1); newCONSTSUB(stash, "A_HINT_STRICT", newSVuv(A_HINT_STRICT));