X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Fautovivification.git;a=blobdiff_plain;f=autovivification.xs;h=9884389bd99370dd398e8a812bfd88e6172d4bcf;hp=de413b4c54c4c8269d783b0fc170190ae731d291;hb=aae04e46de5be0dc7e9abfc02035b6bb09aea6a7;hpb=2966b83e4eb41f8bd7f8c354e078bce07ced1fea diff --git a/autovivification.xs b/autovivification.xs index de413b4..9884389 100644 --- a/autovivification.xs +++ b/autovivification.xs @@ -11,61 +11,374 @@ /* --- Compatibility wrappers ---------------------------------------------- */ +#ifndef HvNAME_get +# define HvNAME_get(H) HvNAME(H) +#endif + +#ifndef HvNAMELEN_get +# define HvNAMELEN_get(H) strlen(HvNAME_get(H)) +#endif + #define A_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S)))))) #ifndef A_WORKAROUND_REQUIRE_PROPAGATION # define A_WORKAROUND_REQUIRE_PROPAGATION !A_HAS_PERL(5, 10, 1) #endif +#ifndef A_HAS_RPEEP +# define A_HAS_RPEEP A_HAS_PERL(5, 13, 5) +#endif + +#ifndef A_HAS_MULTIDEREF +# define A_HAS_MULTIDEREF A_HAS_PERL(5, 21, 7) +#endif + +#ifndef OpSIBLING +# ifdef OP_SIBLING +# define OpSIBLING(O) OP_SIBLING(O) +# else +# define OpSIBLING(O) ((O)->op_sibling) +# endif +#endif + +/* ... Our vivify_ref() .................................................... */ + +/* Perl_vivify_ref() is not exported, so we have to reimplement it. */ + +#if A_HAS_MULTIDEREF + +static SV *a_vivify_ref(pTHX_ SV *sv, int to_hash) { +#define a_vivify_ref(S, TH) a_vivify_ref(aTHX_ (S), (TH)) + SvGETMAGIC(sv); + + if (!SvOK(sv)) { + SV *val; + + if (SvREADONLY(sv)) + Perl_croak_no_modify(); + + /* Inlined prepare_SV_for_RV() */ + if (SvTYPE(sv) < SVt_PV && SvTYPE(sv) != SVt_IV) { + sv_upgrade(sv, SVt_IV); + } else if (SvTYPE(sv) >= SVt_PV) { + SvPV_free(sv); + SvLEN_set(sv, 0); + SvCUR_set(sv, 0); + } + + val = to_hash ? MUTABLE_SV(newHV()) : MUTABLE_SV(newAV()); + SvRV_set(sv, val); + SvROK_on(sv); + SvSETMAGIC(sv); + SvGETMAGIC(sv); + } + + if (SvGMAGICAL(sv)) { + SV *msv = sv_newmortal(); + sv_setsv_nomg(msv, sv); + return msv; + } + + return sv; +} + +#endif /* A_HAS_MULTIDEREF */ + +/* ... Thread safety and multiplicity ...................................... */ + +/* Always safe when the workaround isn't needed */ +#if !A_WORKAROUND_REQUIRE_PROPAGATION +# undef A_FORKSAFE +# define A_FORKSAFE 1 +/* Otherwise, safe unless Makefile.PL says it's Win32 */ +#elif !defined(A_FORKSAFE) +# define A_FORKSAFE 1 +#endif + +#ifndef A_MULTIPLICITY +# if defined(MULTIPLICITY) +# define A_MULTIPLICITY 1 +# else +# define A_MULTIPLICITY 0 +# endif +#endif +#if A_MULTIPLICITY +# ifndef PERL_IMPLICIT_CONTEXT +# error MULTIPLICITY builds must set PERL_IMPLICIT_CONTEXT +# endif +#endif + +#ifndef tTHX +# define tTHX PerlInterpreter* +#endif + +#if A_MULTIPLICITY && defined(USE_ITHREADS) && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && (defined(MY_CXT_CLONE) || defined(dMY_CXT_SV)) +# define A_THREADSAFE 1 +# ifndef MY_CXT_CLONE +# define MY_CXT_CLONE \ + dMY_CXT_SV; \ + my_cxt_t *my_cxtp = (my_cxt_t*)SvPVX(newSV(sizeof(my_cxt_t)-1)); \ + Copy(INT2PTR(my_cxt_t*, SvUV(my_cxt_sv)), my_cxtp, 1, my_cxt_t); \ + sv_setuv(my_cxt_sv, PTR2UV(my_cxtp)) +# endif +#else +# define A_THREADSAFE 0 +# undef dMY_CXT +# define dMY_CXT dNOOP +# undef MY_CXT +# define MY_CXT a_globaldata +# undef START_MY_CXT +# define START_MY_CXT static my_cxt_t MY_CXT; +# undef MY_CXT_INIT +# define MY_CXT_INIT NOOP +# undef MY_CXT_CLONE +# define MY_CXT_CLONE NOOP +#endif + +#if A_THREADSAFE +/* We must use preexistent global mutexes or we will never be able to destroy + * them. */ +# if A_HAS_PERL(5, 9, 3) +# define A_LOADED_LOCK MUTEX_LOCK(&PL_my_ctx_mutex) +# define A_LOADED_UNLOCK MUTEX_UNLOCK(&PL_my_ctx_mutex) +# else +# define A_LOADED_LOCK OP_REFCNT_LOCK +# define A_LOADED_UNLOCK OP_REFCNT_UNLOCK +# endif +#else +# define A_LOADED_LOCK NOOP +# define A_LOADED_UNLOCK NOOP +#endif + +#if defined(OP_CHECK_MUTEX_LOCK) && defined(OP_CHECK_MUTEX_UNLOCK) +# define A_CHECK_LOCK OP_CHECK_MUTEX_LOCK +# define A_CHECK_UNLOCK OP_CHECK_MUTEX_UNLOCK +#elif A_HAS_PERL(5, 9, 3) +# define A_CHECK_LOCK OP_REFCNT_LOCK +# define A_CHECK_UNLOCK OP_REFCNT_UNLOCK +#else +/* Before perl 5.9.3, indirect_ck_*() calls are already protected by the + * A_LOADED mutex, which falls back to the OP_REFCNT mutex. Make sure we don't + * lock it twice. */ +# define A_CHECK_LOCK NOOP +# define A_CHECK_UNLOCK NOOP +#endif + +typedef OP *(*a_ck_t)(pTHX_ OP *); + +#ifdef wrap_op_checker + +# define a_ck_replace(T, NC, OCP) wrap_op_checker((T), (NC), (OCP)) + +#else + +static void a_ck_replace(pTHX_ OPCODE type, a_ck_t new_ck, a_ck_t *old_ck_p) { +#define a_ck_replace(T, NC, OCP) a_ck_replace(aTHX_ (T), (NC), (OCP)) + A_CHECK_LOCK; + if (!*old_ck_p) { + *old_ck_p = PL_check[type]; + PL_check[type] = new_ck; + } + A_CHECK_UNLOCK; +} + +#endif + +static void a_ck_restore(pTHX_ OPCODE type, a_ck_t *old_ck_p) { +#define a_ck_restore(T, OCP) a_ck_restore(aTHX_ (T), (OCP)) + A_CHECK_LOCK; + if (*old_ck_p) { + PL_check[type] = *old_ck_p; + *old_ck_p = 0; + } + A_CHECK_UNLOCK; +} + /* --- Helpers ------------------------------------------------------------- */ +/* ... Check if the module is loaded ....................................... */ + +static I32 a_loaded = 0; + +#if A_THREADSAFE + +#define PTABLE_NAME ptable_loaded +#define PTABLE_NEED_DELETE 1 +#define PTABLE_NEED_WALK 0 + +#include "ptable.h" + +#define ptable_loaded_store(T, K, V) ptable_loaded_store(aPTBLMS_ (T), (K), (V)) +#define ptable_loaded_delete(T, K) ptable_loaded_delete(aPTBLMS_ (T), (K)) +#define ptable_loaded_free(T) ptable_loaded_free(aPTBLMS_ (T)) + +static ptable *a_loaded_cxts = NULL; + +static int a_is_loaded(pTHX_ void *cxt) { +#define a_is_loaded(C) a_is_loaded(aTHX_ (C)) + int res = 0; + + A_LOADED_LOCK; + if (a_loaded_cxts && ptable_fetch(a_loaded_cxts, cxt)) + res = 1; + A_LOADED_UNLOCK; + + return res; +} + +static int a_set_loaded_locked(pTHX_ void *cxt) { +#define a_set_loaded_locked(C) a_set_loaded_locked(aTHX_ (C)) + int global_setup = 0; + + if (a_loaded <= 0) { + assert(a_loaded == 0); + assert(!a_loaded_cxts); + a_loaded_cxts = ptable_new(); + global_setup = 1; + } + ++a_loaded; + assert(a_loaded_cxts); + ptable_loaded_store(a_loaded_cxts, cxt, cxt); + + return global_setup; +} + +static int a_clear_loaded_locked(pTHX_ void *cxt) { +#define a_clear_loaded_locked(C) a_clear_loaded_locked(aTHX_ (C)) + int global_teardown = 0; + + if (a_loaded > 1) { + assert(a_loaded_cxts); + ptable_loaded_delete(a_loaded_cxts, cxt); + --a_loaded; + } else if (a_loaded_cxts) { + assert(a_loaded == 1); + ptable_loaded_free(a_loaded_cxts); + a_loaded_cxts = NULL; + a_loaded = 0; + global_teardown = 1; + } + + return global_teardown; +} + +#else + +#define a_is_loaded(C) (a_loaded > 0) +#define a_set_loaded_locked(C) ((a_loaded++ <= 0) ? 1 : 0) +#define a_clear_loaded_locked(C) ((--a_loaded <= 0) ? 1 : 0) + +#endif + +/* ... Thread-safe hints ................................................... */ + #if A_WORKAROUND_REQUIRE_PROPAGATION typedef struct { - UV bits; - I32 requires; + U32 bits; + IV require_tag; } 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_HINT_FREE(H) PerlMemShared_free(H) - h.bits = bits; +#if A_THREADSAFE - { - const PERL_SI *si; - I32 requires = 0; +#define PTABLE_NAME ptable_hints +#define PTABLE_VAL_FREE(V) A_HINT_FREE(V) +#define PTABLE_NEED_DELETE 0 +#define PTABLE_NEED_WALK 1 - for (si = PL_curstackinfo; si; si = si->si_prev) { - I32 cxix; +#define pPTBL pTHX +#define pPTBL_ pTHX_ +#define aPTBL aTHX +#define aPTBL_ aTHX_ - for (cxix = si->si_cxix; cxix >= 0; --cxix) { - const PERL_CONTEXT *cx = si->si_cxstack + cxix; +#include "ptable.h" - if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_op_type == OP_REQUIRE) - ++requires; - } - } +#define ptable_hints_store(T, K, V) ptable_hints_store(aTHX_ (T), (K), (V)) +#define ptable_hints_free(T) ptable_hints_free(aTHX_ (T)) - h.requires = requires; - } +#endif /* A_THREADSAFE */ + +#endif /* A_WORKAROUND_REQUIRE_PROPAGATION */ + +#define PTABLE_NAME ptable_seen +#define PTABLE_NEED_DELETE 0 +#define PTABLE_NEED_WALK 0 + +#include "ptable.h" - return newSVpvn((const char *) &h, sizeof h); +/* PerlMemShared_free() needs the [ap]PTBLMS_? default values */ +#define ptable_seen_store(T, K, V) ptable_seen_store(aPTBLMS_ (T), (K), (V)) +#define ptable_seen_clear(T) ptable_seen_clear(aPTBLMS_ (T)) +#define ptable_seen_free(T) ptable_seen_free(aPTBLMS_ (T)) + +#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION + +typedef struct { + peep_t old_peep; /* This is actually the rpeep past 5.13.5 */ + ptable *seen; /* It really is a ptable_seen */ +#if A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION + ptable *tbl; /* It really is a ptable_hints */ + tTHX owner; +#endif /* A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION */ +} my_cxt_t; + +START_MY_CXT + +#if A_WORKAROUND_REQUIRE_PROPAGATION + +#if A_THREADSAFE + +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_) { + a_ptable_clone_ud *ud = ud_; + a_hint_t *h1 = ent->val; + a_hint_t *h2; + + h2 = PerlMemShared_malloc(sizeof *h2); + h2->bits = h1->bits; + h2->require_tag = PTR2IV(a_dup_inc(INT2PTR(SV *, h1->require_tag), ud)); + + ptable_hints_store(ud->tbl, ent->key, h2); } -STATIC UV a_detag(pTHX_ const SV *hint) { -#define a_detag(H) a_detag(aTHX_ (H)) - const a_hint_t *h; +#endif /* A_THREADSAFE */ - if (!(hint && SvOK(hint))) - return 0; +static IV a_require_tag(pTHX) { +#define a_require_tag() a_require_tag(aTHX) + const CV *cv, *outside; - h = (const a_hint_t *) SvPVX(hint); + cv = PL_compcv; - { + if (!cv) { + /* If for some reason the pragma is operational at run-time, try to discover + * the current cv in use. */ const PERL_SI *si; - I32 requires = 0; for (si = PL_curstackinfo; si; si = si->si_prev) { I32 cxix; @@ -73,20 +386,96 @@ STATIC UV a_detag(pTHX_ const SV *hint) { 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 > h->requires) - return 0; + switch (CxTYPE(cx)) { + case CXt_SUB: + case CXt_FORMAT: + /* The propagation workaround is only needed up to 5.10.0 and at that + * time format and sub contexts were still identical. And even later the + * cv members offsets should have been kept the same. */ + cv = cx->blk_sub.cv; + goto get_enclosing_cv; + case CXt_EVAL: + cv = cx->blk_eval.cv; + goto get_enclosing_cv; + default: + break; + } } } + + cv = PL_main_cv; } +get_enclosing_cv: + for (outside = CvOUTSIDE(cv); outside; outside = CvOUTSIDE(cv)) + cv = outside; + + return PTR2IV(cv); +} + +static SV *a_tag(pTHX_ UV bits) { +#define a_tag(B) a_tag(aTHX_ (B)) + a_hint_t *h; +#if A_THREADSAFE + dMY_CXT; + + if (!MY_CXT.tbl) + return newSViv(0); +#endif /* A_THREADSAFE */ + + h = PerlMemShared_malloc(sizeof *h); + h->bits = bits; + h->require_tag = a_require_tag(); + +#if A_THREADSAFE + /* We only need for the key to be an unique tag for looking up the value later + * Allocated memory provides convenient unique identifiers, so that's why we + * use the hint as the key itself. */ + ptable_hints_store(MY_CXT.tbl, h, h); +#endif /* A_THREADSAFE */ + + return newSViv(PTR2IV(h)); +} + +static UV a_detag(pTHX_ const SV *hint) { +#define a_detag(H) a_detag(aTHX_ (H)) + a_hint_t *h; +#if A_THREADSAFE + dMY_CXT; + + if (!MY_CXT.tbl) + return 0; +#endif /* A_THREADSAFE */ + + if (!(hint && SvIOK(hint))) + return 0; + + h = INT2PTR(a_hint_t *, SvIVX(hint)); +#if A_THREADSAFE + h = ptable_fetch(MY_CXT.tbl, h); +#endif /* A_THREADSAFE */ + + if (a_require_tag() != h->require_tag) + return 0; + return h->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,21 +491,24 @@ 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 VOL U32 a_hash = 0; -STATIC UV a_hint(pTHX) { +static UV a_hint(pTHX) { #define a_hint() a_hint(aTHX) - const SV *hint; -#if A_HAS_PERL(5, 9, 5) + SV *hint; +#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__, 0, a_hash); #else - SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, a_hash); + SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, 0); if (!val) return 0; hint = *val; @@ -127,32 +519,66 @@ STATIC UV a_hint(pTHX) { /* ... op => info map ...................................................... */ typedef struct { - OP *(*old_pp)(pTHX); - const OP *root; - UV flags; + OP *(*old_pp)(pTHX); + void *next; + UV flags; } a_op_info; #define PTABLE_NAME ptable_map #define PTABLE_VAL_FREE(V) PerlMemShared_free(V) +#define PTABLE_NEED_DELETE 1 +#define PTABLE_NEED_WALK 0 #include "ptable.h" /* PerlMemShared_free() needs the [ap]PTBLMS_? default values */ #define ptable_map_store(T, K, V) ptable_map_store(aPTBLMS_ (T), (K), (V)) +#define ptable_map_delete(T, K) ptable_map_delete(aPTBLMS_ (T), (K)) +#define ptable_map_free(T) ptable_map_free(aPTBLMS_ (T)) -STATIC ptable *a_op_map = NULL; +static ptable *a_op_map = NULL; #ifdef USE_ITHREADS -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; +#define dA_MAP_THX a_op_info a_op_map_tmp_oi -#ifdef USE_ITHREADS - MUTEX_LOCK(&a_op_map_mutex); -#endif +static perl_mutex a_op_map_mutex; + +#define A_LOCK(M) MUTEX_LOCK(M) +#define A_UNLOCK(M) MUTEX_UNLOCK(M) + +static const a_op_info *a_map_fetch(const OP *o, a_op_info *oi) { + const a_op_info *val; + + A_LOCK(&a_op_map_mutex); + + val = ptable_fetch(a_op_map, o); + if (val) { + *oi = *val; + val = oi; + } + + A_UNLOCK(&a_op_map_mutex); + + return val; +} + +#define a_map_fetch(O) a_map_fetch((O), &a_op_map_tmp_oi) + +#else /* USE_ITHREADS */ + +#define dA_MAP_THX dNOOP + +#define A_LOCK(M) NOOP +#define A_UNLOCK(M) NOOP + +#define a_map_fetch(O) ptable_fetch(a_op_map, (O)) + +#endif /* !USE_ITHREADS */ + +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); @@ -160,386 +586,1099 @@ STATIC void a_map_store(pPTBLMS_ const OP *o, OP *(*old_pp)(pTHX), UV flags) { } 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)) + A_LOCK(&a_op_map_mutex); -#ifdef USE_ITHREADS - MUTEX_LOCK(&a_op_map_mutex); -#endif + a_map_store_locked(o, old_pp, next, flags); - val = ptable_fetch(a_op_map, o); - if (val) { - *oi = *val; - val = oi; - } else - oi->old_pp = 0; + A_UNLOCK(&a_op_map_mutex); +} -#ifdef USE_ITHREADS - MUTEX_UNLOCK(&a_op_map_mutex); -#endif +static void a_map_delete(pTHX_ const OP *o) { +#define a_map_delete(O) a_map_delete(aTHX_ (O)) + A_LOCK(&a_op_map_mutex); - return val; + ptable_map_delete(a_op_map, o); + + A_UNLOCK(&a_op_map_mutex); } -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; -#ifdef USE_ITHREADS - MUTEX_LOCK(&a_op_map_mutex); -#endif + A_LOCK(&a_op_map_mutex); + + roi = a_map_store_locked(o, old_pp, (OP *) root, flags | A_HINT_ROOT); - while (o) { - if (oi = ptable_fetch(a_op_map, o)) { - oi->root = root; - oi->flags = flags; + 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; } + } + + A_UNLOCK(&a_op_map_mutex); + + return; +} + +static void a_map_update_flags_topdown(const OP *root, UV flags) { + a_op_info *oi; + const OP *o = root; + + A_LOCK(&a_op_map_mutex); + + 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); + + A_UNLOCK(&a_op_map_mutex); + + 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; + + A_LOCK(&a_op_map_mutex); + + 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 + A_UNLOCK(&a_op_map_mutex); + + return; } -/* ... Lightweight pp_defined() ............................................ */ +/* ... Decide whether this expression should be autovivified or not ........ */ -STATIC bool a_defined(pTHX_ SV *sv) { -#define a_defined(S) a_defined(aTHX_ (S)) - bool defined = FALSE; +static UV a_map_resolve(const OP *o, const a_op_info *oi) { + UV flags = 0, rflags; + const OP *root; + const 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; +} +/* ... Inspired from pp_defined() .......................................... */ + +static int a_undef(pTHX_ SV *sv) { +#define a_undef(S) a_undef(aTHX_ (S)) switch (SvTYPE(sv)) { + case SVt_NULL: + return 1; case SVt_PVAV: if (AvMAX(sv) >= 0 || SvGMAGICAL(sv) || (SvRMAGICAL(sv) && mg_find(sv, PERL_MAGIC_tied))) - defined = TRUE; + return 0; break; case SVt_PVHV: if (HvARRAY(sv) || SvGMAGICAL(sv) || (SvRMAGICAL(sv) && mg_find(sv, PERL_MAGIC_tied))) - defined = TRUE; + return 0; break; default: - defined = SvOK(sv); + SvGETMAGIC(sv); + if (SvOK(sv)) + return 0; } - return defined; + return 1; } /* --- 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; +static OP *a_pp_rv2av(pTHX) { + dA_MAP_THX; + const a_op_info *oi; dSP; - if (!SvOK(TOPs)) { - SV *av; - POPs; - av = sv_2mortal((SV *) newAV()); - PUSHs(av); - RETURN; + oi = a_map_fetch(PL_op); + + if (oi->flags & A_HINT_DEREF) { + if (a_undef(TOPs)) { + /* We always need to push an empty array to fool the pp_aelem() that comes + * later. */ + SV *av; + (void) POPs; + av = sv_2mortal((SV *) newAV()); + PUSHs(av); + RETURN; + } } - a_map_fetch(PL_op, &oi); - - return CALL_FPTR(oi.old_pp)(aTHX); + return oi->old_pp(aTHX); } /* ... pp_rv2hv ............................................................ */ -STATIC OP *a_pp_rv2hv(pTHX) { - a_op_info oi; - UV hint; +static OP *a_pp_rv2hv_simple(pTHX) { + dA_MAP_THX; + const a_op_info *oi; dSP; - if (!SvOK(TOPs)) - RETURN; + oi = a_map_fetch(PL_op); + + if (oi->flags & A_HINT_DEREF) { + if (a_undef(TOPs)) + RETURN; + } + + return oi->old_pp(aTHX); +} + +static OP *a_pp_rv2hv(pTHX) { + dA_MAP_THX; + const a_op_info *oi; + dSP; + + oi = a_map_fetch(PL_op); - a_map_fetch(PL_op, &oi); + if (oi->flags & A_HINT_DEREF) { + if (a_undef(TOPs)) { + SV *hv; + (void) POPs; + hv = sv_2mortal((SV *) newHV()); + PUSHs(hv); + RETURN; + } + } - return CALL_FPTR(oi.old_pp)(aTHX); + return oi->old_pp(aTHX); } /* ... 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 void a_cannot_vivify(pTHX_ UV flags) { +#define a_cannot_vivify(F) a_cannot_vivify(aTHX_ (F)) + if (flags & A_HINT_STRICT) + croak("Reference vivification forbidden"); + else if (flags & A_HINT_WARN) + warn("Reference was vivified"); + else /* A_HINT_STORE */ + croak("Can't vivify reference"); +} -STATIC OP *a_pp_deref(pTHX) { - a_op_info oi; +static OP *a_pp_deref(pTHX) { + dA_MAP_THX; + const a_op_info *oi; UV flags; dSP; - a_map_fetch(PL_op, &oi); - flags = oi.flags; + oi = a_map_fetch(PL_op); + flags = oi->flags; if (flags & A_HINT_DEREF) { OP *o; - U8 old_private; -deref: - old_private = PL_op->op_private; - PL_op->op_private &= ~OPpDEREF; - PL_op->op_private |= OPpLVAL_DEFER; - o = CALL_FPTR(oi.old_pp)(aTHX); - PL_op->op_private = old_private; + o = oi->old_pp(aTHX); if (flags & (A_HINT_NOTIFY|A_HINT_STORE)) { SPAGAIN; - if (!SvOK(TOPs)) { - if (flags & A_HINT_STRICT) - croak(a_msg_forbidden); - else if (flags & A_HINT_WARN) - warn(a_msg_forbidden); - else /* A_HINT_STORE */ - croak(a_msg_impossible); - } + if (a_undef(TOPs)) + a_cannot_vivify(flags); } return o; - } else if (flags && (PL_op->op_private & OPpDEREF || PL_op == oi.root)) { - oi.flags = flags & A_HINT_NOTIFY; - - if (oi.root->op_flags & OPf_MOD) { - if (flags & A_HINT_STORE) - oi.flags |= (A_HINT_STORE|A_HINT_DEREF); - } else if (flags & A_HINT_FETCH) - oi.flags |= (A_HINT_FETCH|A_HINT_DEREF); + } - if (PL_op == oi.root) - oi.flags &= ~A_HINT_DEREF; + return 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) { + 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_undef(TOPs)) { + (void) POPs; + /* Can only be reached by keys or values */ + if (GIMME_V == G_SCALAR) { + dTARGET; + PUSHi(0); + } + RETURN; } - return CALL_FPTR(oi.old_pp)(aTHX); + { + dA_MAP_THX; + const a_op_info *oi = a_map_fetch(PL_op); + return oi->old_pp(aTHX); + } } -/* ... pp_root (exists,delete) ............................................. */ - -STATIC OP *a_pp_root(pTHX) { - a_op_info oi; +static OP *a_pp_root_binop(pTHX) { dSP; - if (!a_defined(TOPm1s)) { - POPs; - POPs; + if (a_undef(TOPm1s)) { + (void) POPs; + (void) POPs; if (PL_op->op_type == OP_EXISTS) RETPUSHNO; else RETPUSHUNDEF; } - a_map_fetch(PL_op, &oi); + { + dA_MAP_THX; + const a_op_info *oi = a_map_fetch(PL_op); + return oi->old_pp(aTHX); + } +} + +#if A_HAS_MULTIDEREF + +/* ... pp_multideref ....................................................... */ + +/* This pp replacement is actually only called for topmost exists/delete ops, + * because we hijack the [ah]elem check functions and this disables the + * optimization for lvalue and rvalue dereferencing. In particular, the + * OPf_MOD branches should never be covered. In the future, the multideref + * optimization might also be disabled for custom exists/delete check functions, + * which will make this section unnecessary. However, the code tries to be as + * general as possible in case I think of a way to reenable the multideref + * optimization even when this module is in use. */ - return CALL_FPTR(oi.old_pp)(aTHX); +static UV a_do_multideref(const OP *o, UV flags) { + UV isexdel, other_flags; + + assert(o->op_type == OP_MULTIDEREF); + + other_flags = flags & ~A_HINT_DO; + + isexdel = o->op_private & (OPpMULTIDEREF_EXISTS|OPpMULTIDEREF_DELETE); + if (isexdel) { + if (isexdel & OPpMULTIDEREF_EXISTS) { + flags &= A_HINT_EXISTS; + } else { + flags &= A_HINT_DELETE; + } + } else { + if (o->op_flags & OPf_MOD) { + flags &= A_HINT_STORE; + } else { + flags &= A_HINT_FETCH; + } + } + + return flags ? (flags | other_flags) : 0; } -/* --- Check functions ----------------------------------------------------- */ +static SV *a_do_fake_pp(pTHX_ OP *op) { +#define a_do_fake_pp(O) a_do_fake_pp(aTHX_ (O)) + { + OP *o = PL_op; + ENTER; + SAVEOP(); + PL_op = op; + PL_op->op_ppaddr(aTHX); + PL_op = o; + LEAVE; + } -/* ... ck_pad{any,sv} ...................................................... */ + { + SV *ret; + dSP; + ret = POPs; + PUTBACK; + return ret; + } +} + +static void a_do_fake_pp_unop_init(pTHX_ UNOP *unop, U32 type, U32 flags) { +#define a_do_fake_pp_unop_init(O, T, F) a_do_fake_pp_unop_init(aTHX_ (O), (T), (F)) + unop->op_type = type; + unop->op_flags = OPf_WANT_SCALAR | (~OPf_WANT & flags); + unop->op_private = 0; + unop->op_first = NULL; + unop->op_ppaddr = PL_ppaddr[type]; +} -/* Sadly, the PADSV OPs we are interested in don't trigger the padsv check - * function, but are instead manually mutated from a PADANY. This is why we set - * PL_ppaddr[OP_PADSV] in the padany check function so that PADSV OPs will have - * their op_ppaddr set to our pp_padsv. PL_ppaddr[OP_PADSV] is then reset at the - * beginning of every ck_pad{any,sv}. Some unwanted OPs can still call our - * pp_padsv, but much less than if we would have set PL_ppaddr[OP_PADSV] - * globally. */ +static SV *a_do_fake_pp_unop_arg1(pTHX_ U32 type, U32 flags, SV *arg) { +#define a_do_fake_pp_unop_arg1(T, F, A) a_do_fake_pp_unop_arg1(aTHX_ (T), (F), (A)) + UNOP unop; + dSP; -STATIC OP *(*a_pp_padsv_saved)(pTHX) = 0; + a_do_fake_pp_unop_init(&unop, type, flags); -STATIC void a_pp_padsv_save(void) { - if (a_pp_padsv_saved) - return; + EXTEND(SP, 1); + PUSHs(arg); + PUTBACK; - a_pp_padsv_saved = PL_ppaddr[OP_PADSV]; - PL_ppaddr[OP_PADSV] = a_pp_deref; + return a_do_fake_pp((OP *) &unop); } -STATIC void a_pp_padsv_restore(OP *o) { - if (!a_pp_padsv_saved) - return; +static SV *a_do_fake_pp_unop_arg2(pTHX_ U32 type, U32 flags, SV *arg1, SV *arg2) { +#define a_do_fake_pp_unop_arg2(T, F, A1, A2) a_do_fake_pp_unop_arg2(aTHX_ (T), (F), (A1), (A2)) + UNOP unop; + dSP; + + a_do_fake_pp_unop_init(&unop, type, flags); - if (o->op_ppaddr == a_pp_deref) - o->op_ppaddr = a_pp_padsv_saved; + EXTEND(SP, 2); + PUSHs(arg1); + PUSHs(arg2); + PUTBACK; - PL_ppaddr[OP_PADSV] = a_pp_padsv_saved; - a_pp_padsv_saved = 0; + return a_do_fake_pp((OP *) &unop); } -STATIC OP *(*a_old_ck_padany)(pTHX_ OP *) = 0; +#define a_do_pp_rv2av(R) a_do_fake_pp_unop_arg1(OP_RV2AV, OPf_REF, (R)) +#define a_do_pp_afetch(A, I) a_do_fake_pp_unop_arg2(OP_AELEM, 0, (A), (I)) +#define a_do_pp_afetch_lv(A, I) a_do_fake_pp_unop_arg2(OP_AELEM, OPf_MOD, (A), (I)) +#define a_do_pp_aexists(A, I) a_do_fake_pp_unop_arg2(OP_EXISTS, OPf_SPECIAL, (A), (I)) +#define a_do_pp_adelete(A, I) a_do_fake_pp_unop_arg2(OP_DELETE, OPf_SPECIAL, (A), (I)) + +#define a_do_pp_rv2hv(R) a_do_fake_pp_unop_arg1(OP_RV2HV, OPf_REF, (R)) +#define a_do_pp_hfetch(H, K) a_do_fake_pp_unop_arg2(OP_HELEM, 0, (H), (K)) +#define a_do_pp_hfetch_lv(H, K) a_do_fake_pp_unop_arg2(OP_HELEM, OPf_MOD, (H), (K)) +#define a_do_pp_hexists(H, K) a_do_fake_pp_unop_arg2(OP_EXISTS, 0, (H), (K)) +#define a_do_pp_hdelete(H, K) a_do_fake_pp_unop_arg2(OP_DELETE, 0, (H), (K)) + +static OP *a_pp_multideref(pTHX) { + UNOP_AUX_item *items; + UV actions; + UV flags = 0; + SV *sv = NULL; + dSP; -STATIC OP *a_ck_padany(pTHX_ OP *o) { + { + dA_MAP_THX; + const a_op_info *oi = a_map_fetch(PL_op); + assert(oi); + flags = a_do_multideref(PL_op, oi->flags); + if (!flags) + return oi->old_pp(aTHX); + } + + items = cUNOP_AUXx(PL_op)->op_aux; + actions = items->uv; + + PL_multideref_pc = items; + + while (1) { + switch (actions & MDEREF_ACTION_MASK) { + case MDEREF_reload: + actions = (++items)->uv; + continue; + case MDEREF_AV_padav_aelem: /* $lex[...] */ + sv = PAD_SVl((++items)->pad_offset); + if (a_undef(sv)) + goto ret_undef; + goto do_AV_aelem; + case MDEREF_AV_gvav_aelem: /* $pkg[...] */ + sv = UNOP_AUX_item_sv(++items); + assert(isGV_with_GP(sv)); + sv = (SV *) GvAVn((GV *) sv); + if (a_undef(sv)) + goto ret_undef; + goto do_AV_aelem; + case MDEREF_AV_pop_rv2av_aelem: /* expr->[...] */ + sv = POPs; + if (a_undef(sv)) + goto ret_undef; + goto do_AV_rv2av_aelem; + case MDEREF_AV_gvsv_vivify_rv2av_aelem: /* $pkg->[...] */ + sv = UNOP_AUX_item_sv(++items); + assert(isGV_with_GP(sv)); + sv = GvSVn((GV *) sv); + if (a_undef(sv)) + goto ret_undef; + goto do_AV_vivify_rv2av_aelem; + case MDEREF_AV_padsv_vivify_rv2av_aelem: /* $lex->[...] */ + sv = PAD_SVl((++items)->pad_offset); + /* FALLTHROUGH */ + case MDEREF_AV_vivify_rv2av_aelem: /* vivify, ->[...] */ + if (a_undef(sv)) + goto ret_undef; +do_AV_vivify_rv2av_aelem: + sv = a_vivify_ref(sv, 0); +do_AV_rv2av_aelem: + sv = a_do_pp_rv2av(sv); +do_AV_aelem: + { + SV *esv; + assert(SvTYPE(sv) == SVt_PVAV); + switch (actions & MDEREF_INDEX_MASK) { + case MDEREF_INDEX_none: + goto finish; + case MDEREF_INDEX_const: + esv = sv_2mortal(newSViv((++items)->iv)); + break; + case MDEREF_INDEX_padsv: + esv = PAD_SVl((++items)->pad_offset); + goto check_elem; + case MDEREF_INDEX_gvsv: + esv = UNOP_AUX_item_sv(++items); + assert(isGV_with_GP(esv)); + esv = GvSVn((GV *) esv); +check_elem: + if (UNLIKELY(SvROK(esv) && !SvGAMAGIC(esv) && ckWARN(WARN_MISC))) + Perl_warner(aTHX_ packWARN(WARN_MISC), + "Use of reference \"%"SVf"\" as array index", + SVfARG(esv)); + break; + } + PL_multideref_pc = items; + if (actions & MDEREF_FLAG_last) { + switch (flags & A_HINT_DO) { + case A_HINT_FETCH: + sv = a_do_pp_afetch(sv, esv); + break; + case A_HINT_STORE: + sv = a_do_pp_afetch_lv(sv, esv); + break; + case A_HINT_EXISTS: + sv = a_do_pp_aexists(sv, esv); + break; + case A_HINT_DELETE: + sv = a_do_pp_adelete(sv, esv); + break; + } + goto finish; + } + sv = a_do_pp_afetch(sv, esv); + break; + } + case MDEREF_HV_padhv_helem: /* $lex{...} */ + sv = PAD_SVl((++items)->pad_offset); + if (a_undef(sv)) + goto ret_undef; + goto do_HV_helem; + case MDEREF_HV_gvhv_helem: /* $pkg{...} */ + sv = UNOP_AUX_item_sv(++items); + assert(isGV_with_GP(sv)); + sv = (SV *) GvHVn((GV *) sv); + if (a_undef(sv)) + goto ret_undef; + goto do_HV_helem; + case MDEREF_HV_pop_rv2hv_helem: /* expr->{...} */ + sv = POPs; + if (a_undef(sv)) + goto ret_undef; + goto do_HV_rv2hv_helem; + case MDEREF_HV_gvsv_vivify_rv2hv_helem: /* $pkg->{...} */ + sv = UNOP_AUX_item_sv(++items); + assert(isGV_with_GP(sv)); + sv = GvSVn((GV *) sv); + if (a_undef(sv)) + goto ret_undef; + goto do_HV_vivify_rv2hv_helem; + case MDEREF_HV_padsv_vivify_rv2hv_helem: /* $lex->{...} */ + sv = PAD_SVl((++items)->pad_offset); + /* FALLTHROUGH */ + case MDEREF_HV_vivify_rv2hv_helem: /* vivify, ->{...} */ + if (a_undef(sv)) + goto ret_undef; +do_HV_vivify_rv2hv_helem: + sv = a_vivify_ref(sv, 1); +do_HV_rv2hv_helem: + sv = a_do_pp_rv2hv(sv); +do_HV_helem: + { + SV *key; + assert(SvTYPE(sv) == SVt_PVHV); + switch (actions & MDEREF_INDEX_MASK) { + case MDEREF_INDEX_none: + goto finish; + case MDEREF_INDEX_const: + key = UNOP_AUX_item_sv(++items); + break; + case MDEREF_INDEX_padsv: + key = PAD_SVl((++items)->pad_offset); + break; + case MDEREF_INDEX_gvsv: + key = UNOP_AUX_item_sv(++items); + assert(isGV_with_GP(key)); + key = GvSVn((GV *) key); + break; + } + PL_multideref_pc = items; + if (actions & MDEREF_FLAG_last) { + switch (flags & A_HINT_DO) { + case A_HINT_FETCH: + sv = a_do_pp_hfetch(sv, key); + break; + case A_HINT_STORE: + sv = a_do_pp_hfetch_lv(sv, key); + break; + case A_HINT_EXISTS: + sv = a_do_pp_hexists(sv, key); + break; + case A_HINT_DELETE: + sv = a_do_pp_hdelete(sv, key); + break; + default: + break; + } + goto finish; + } + sv = a_do_pp_hfetch(sv, key); + break; + } + } + + actions >>= MDEREF_SHIFT; + } + +ret_undef: + if (flags & (A_HINT_NOTIFY|A_HINT_STORE)) + a_cannot_vivify(flags); + if (flags & A_HINT_EXISTS) + sv = &PL_sv_no; + else + sv = &PL_sv_undef; +finish: + XPUSHs(sv); + RETURN; +} + +#endif /* A_HAS_MULTIDEREF */ + +/* --- 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)) + + if (o->op_type == type && o->op_ppaddr != new_pp + && cUNOPo->op_first->op_type != OP_GV) { + dA_MAP_THX; + const a_op_info *oi = a_map_fetch(o); + if (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 + * function, but are instead manually mutated from a padany. So we store + * the op entry in the op map in the padany check function, and we set their + * op_ppaddr member in our peephole optimizer replacement below. */ + +static OP *(*a_old_ck_padany)(pTHX_ OP *) = 0; + +static OP *a_ck_padany(pTHX_ OP *o) { UV hint; - a_pp_padsv_restore(o); + o = a_old_ck_padany(aTHX_ o); - o = CALL_FPTR(a_old_ck_padany)(aTHX_ o); + hint = a_hint(); + if (hint & A_HINT_DO) + a_map_store_root(o, o->op_ppaddr, hint); + else + a_map_delete(o); + + return o; +} + +static OP *(*a_old_ck_padsv)(pTHX_ OP *) = 0; + +static OP *a_ck_padsv(pTHX_ OP *o) { + UV hint; + + o = a_old_ck_padsv(aTHX_ 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, o->op_ppaddr, hint); + o->op_ppaddr = a_pp_deref; } else - a_map_store(o, 0, 0); + a_map_delete(o); return o; } -STATIC OP *(*a_old_ck_padsv)(pTHX_ OP *) = 0; +/* ... ck_deref (aelem,helem,rv2sv) ........................................ */ -STATIC OP *a_ck_padsv(pTHX_ OP *o) { - UV hint; +/* 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. */ - a_pp_padsv_restore(o); +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; - o = CALL_FPTR(a_old_ck_padsv)(aTHX_ o); +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 = old_ck(aTHX_ o); + +#if A_HAS_MULTIDEREF + if (old_ck == a_old_ck_rv2sv && o->op_flags & OPf_KIDS) { + OP *kid = cUNOPo->op_first; + if (kid && kid->op_type == OP_GV) { + if (hint & A_HINT_DO) + a_map_store(kid, kid->op_ppaddr, NULL, hint); + else + a_map_delete(kid); + } + } +#endif - 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_store(o, 0, 0); + a_map_delete(o); return o; } -/* ... ck_deref (aelem,helem,rv2sv) ........................................ */ +/* ... 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_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_old_ck_rv2av)(pTHX_ OP *) = 0; +static OP *(*a_old_ck_rv2hv)(pTHX_ OP *) = 0; -STATIC OP *a_ck_deref(pTHX_ OP *o) { +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); + o = 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(OpSIBLING(cUNOPo->op_first), OP_RV2HV, a_pp_rv2hv); + break; + } + o = 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_store(o, 0, 0); + 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_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) { +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); + o = 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; } -STATIC U32 a_initialized = 0; +/* ... Our peephole optimizer .............................................. */ -/* --- XS ------------------------------------------------------------------ */ +static void a_peep_rec(pTHX_ OP *o, ptable *seen); -MODULE = autovivification PACKAGE = autovivification +static void a_peep_rec(pTHX_ OP *o, ptable *seen) { +#define a_peep_rec(O) a_peep_rec(aTHX_ (O), seen) + for (; o; o = o->op_next) { + dA_MAP_THX; + const a_op_info *oi = NULL; + UV flags = 0; -PROTOTYPES: ENABLE +#if !A_HAS_RPEEP + if (ptable_fetch(seen, o)) + break; + ptable_seen_store(seen, o, o); +#endif -BOOT: -{ - if (!a_initialized++) { - HV *stash; + switch (o->op_type) { +#if A_HAS_RPEEP + case OP_NEXTSTATE: + case OP_DBSTATE: + case OP_STUB: + case OP_UNSTACK: + if (ptable_fetch(seen, o)) + return; + ptable_seen_store(seen, o, o); + break; +#endif + case OP_PADSV: + if (o->op_ppaddr != a_pp_deref) { + oi = a_map_fetch(o); + if (oi && (oi->flags & A_HINT_DO)) { + a_map_store(o, o->op_ppaddr, oi->next, oi->flags); + o->op_ppaddr = a_pp_deref; + } + } + /* FALLTHROUGH */ + case OP_AELEM: + case OP_AELEMFAST: + case OP_HELEM: + case OP_RV2SV: + if (o->op_ppaddr != a_pp_deref) + break; + oi = a_map_fetch(o); + if (!oi) + break; + flags = oi->flags; + if (!(flags & A_HINT_DEREF) + && (flags & A_HINT_DO) + && (o->op_private & OPpDEREF || flags & A_HINT_ROOT)) { + /* Decide if the expression must autovivify or not. */ + flags = a_map_resolve(o, oi); + } + if (flags & A_HINT_DEREF) + o->op_private = ((o->op_private & ~OPpDEREF) | OPpLVAL_DEFER); + else + o->op_ppaddr = oi->old_pp; + break; + case OP_RV2AV: + case OP_RV2HV: + if ( o->op_ppaddr != a_pp_rv2av + && o->op_ppaddr != a_pp_rv2hv + && o->op_ppaddr != a_pp_rv2hv_simple) + break; + oi = a_map_fetch(o); + if (!oi) + break; + if (!(oi->flags & A_HINT_DEREF)) + o->op_ppaddr = oi->old_pp; + break; +#if A_HAS_MULTIDEREF + case OP_MULTIDEREF: + if (o->op_ppaddr != a_pp_multideref) { + oi = a_map_fetch(cUNOPo->op_first); + if (!oi) + break; + flags = oi->flags; + if (a_do_multideref(o, flags)) { + a_map_store_root(o, o->op_ppaddr, flags & ~A_HINT_DEREF); + o->op_ppaddr = a_pp_multideref; + } + } + break; +#endif +#if !A_HAS_RPEEP + case OP_MAPWHILE: + case OP_GREPWHILE: + case OP_AND: + case OP_OR: + case OP_ANDASSIGN: + case OP_ORASSIGN: + case OP_COND_EXPR: + case OP_RANGE: +# if A_HAS_PERL(5, 10, 0) + case OP_ONCE: + case OP_DOR: + case OP_DORASSIGN: +# endif + a_peep_rec(cLOGOPo->op_other); + break; + case OP_ENTERLOOP: + case OP_ENTERITER: + a_peep_rec(cLOOPo->op_redoop); + a_peep_rec(cLOOPo->op_nextop); + a_peep_rec(cLOOPo->op_lastop); + break; +# if A_HAS_PERL(5, 9, 5) + case OP_SUBST: + a_peep_rec(cPMOPo->op_pmstashstartu.op_pmreplstart); + break; +# else + case OP_QR: + case OP_MATCH: + case OP_SUBST: + a_peep_rec(cPMOPo->op_pmreplstart); + break; +# endif +#endif /* !A_HAS_RPEEP */ + default: + break; + } + } +} + +static void a_peep(pTHX_ OP *o) { + ptable *seen; + dMY_CXT; + + assert(a_is_loaded(&MY_CXT)); + + MY_CXT.old_peep(aTHX_ o); + + seen = MY_CXT.seen; + if (seen) { + ptable_seen_clear(seen); + a_peep_rec(o); + ptable_seen_clear(seen); + } +} + +/* --- Module setup/teardown ----------------------------------------------- */ + +static void a_teardown(pTHX_ void *root) { + dMY_CXT; + + A_LOADED_LOCK; + + if (a_clear_loaded_locked(&MY_CXT)) { + a_ck_restore(OP_PADANY, &a_old_ck_padany); + a_ck_restore(OP_PADSV, &a_old_ck_padsv); + + a_ck_restore(OP_AELEM, &a_old_ck_aelem); + a_ck_restore(OP_HELEM, &a_old_ck_helem); + a_ck_restore(OP_RV2SV, &a_old_ck_rv2sv); + + a_ck_restore(OP_RV2AV, &a_old_ck_rv2av); + a_ck_restore(OP_RV2HV, &a_old_ck_rv2hv); + + a_ck_restore(OP_ASLICE, &a_old_ck_aslice); + a_ck_restore(OP_HSLICE, &a_old_ck_hslice); + + a_ck_restore(OP_EXISTS, &a_old_ck_exists); + a_ck_restore(OP_DELETE, &a_old_ck_delete); + a_ck_restore(OP_KEYS, &a_old_ck_keys); + a_ck_restore(OP_VALUES, &a_old_ck_values); + + ptable_map_free(a_op_map); + a_op_map = NULL; + +#ifdef USE_ITHREADS + MUTEX_DESTROY(&a_op_map_mutex); +#endif + } + + A_LOADED_UNLOCK; + + if (MY_CXT.old_peep) { +#if A_HAS_RPEEP + PL_rpeepp = MY_CXT.old_peep; +#else + PL_peepp = MY_CXT.old_peep; +#endif + MY_CXT.old_peep = 0; + } + + ptable_seen_free(MY_CXT.seen); + MY_CXT.seen = NULL; + +#if A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION + ptable_hints_free(MY_CXT.tbl); + MY_CXT.tbl = NULL; +#endif /* A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION */ + + return; +} + +static void a_setup(pTHX) { +#define a_setup() a_setup(aTHX) + MY_CXT_INIT; /* Takes/release PL_my_ctx_mutex */ + + A_LOADED_LOCK; + + if (a_set_loaded_locked(&MY_CXT)) { + PERL_HASH(a_hash, __PACKAGE__, __PACKAGE_LEN__); a_op_map = ptable_new(); + #ifdef USE_ITHREADS MUTEX_INIT(&a_op_map_mutex); #endif - PERL_HASH(a_hash, __PACKAGE__, __PACKAGE_LEN__); + a_ck_replace(OP_PADANY, a_ck_padany, &a_old_ck_padany); + a_ck_replace(OP_PADSV, a_ck_padsv, &a_old_ck_padsv); - a_old_ck_padany = PL_check[OP_PADANY]; - 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_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_ck_replace(OP_AELEM, a_ck_deref, &a_old_ck_aelem); + a_ck_replace(OP_HELEM, a_ck_deref, &a_old_ck_helem); + a_ck_replace(OP_RV2SV, a_ck_deref, &a_old_ck_rv2sv); + + a_ck_replace(OP_RV2AV, a_ck_rv2xv, &a_old_ck_rv2av); + a_ck_replace(OP_RV2HV, a_ck_rv2xv, &a_old_ck_rv2hv); + + a_ck_replace(OP_ASLICE, a_ck_xslice, &a_old_ck_aslice); + a_ck_replace(OP_HSLICE, a_ck_xslice, &a_old_ck_hslice); + + a_ck_replace(OP_EXISTS, a_ck_root, &a_old_ck_exists); + a_ck_replace(OP_DELETE, a_ck_root, &a_old_ck_delete); + a_ck_replace(OP_KEYS, a_ck_root, &a_old_ck_keys); + a_ck_replace(OP_VALUES, a_ck_root, &a_old_ck_values); + } + + A_LOADED_UNLOCK; + + { + HV *stash; stash = gv_stashpvn(__PACKAGE__, __PACKAGE_LEN__, 1); newCONSTSUB(stash, "A_HINT_STRICT", newSVuv(A_HINT_STRICT)); @@ -549,9 +1688,87 @@ BOOT: newCONSTSUB(stash, "A_HINT_EXISTS", newSVuv(A_HINT_EXISTS)); newCONSTSUB(stash, "A_HINT_DELETE", newSVuv(A_HINT_DELETE)); newCONSTSUB(stash, "A_HINT_MASK", newSVuv(A_HINT_MASK)); + newCONSTSUB(stash, "A_THREADSAFE", newSVuv(A_THREADSAFE)); + newCONSTSUB(stash, "A_FORKSAFE", newSVuv(A_FORKSAFE)); + } + +#if A_HAS_RPEEP + if (PL_rpeepp != a_peep) { + MY_CXT.old_peep = PL_rpeepp; + PL_rpeepp = a_peep; + } +#else + if (PL_peepp != a_peep) { + MY_CXT.old_peep = PL_peepp; + PL_peepp = a_peep; + } +#endif + else { + MY_CXT.old_peep = 0; } + + MY_CXT.seen = ptable_new(); + +#if A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION + MY_CXT.tbl = ptable_new(); + MY_CXT.owner = aTHX; +#endif /* A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION */ + + call_atexit(a_teardown, NULL); + + return; +} + +/* --- XS ------------------------------------------------------------------ */ + +MODULE = autovivification PACKAGE = autovivification + +PROTOTYPES: ENABLE + +BOOT: +{ + a_setup(); } +#if A_THREADSAFE + +void +CLONE(...) +PROTOTYPE: DISABLE +PREINIT: +#if A_WORKAROUND_REQUIRE_PROPAGATION + ptable *t; +#endif +PPCODE: +#if A_WORKAROUND_REQUIRE_PROPAGATION + { + a_ptable_clone_ud ud; + dMY_CXT; + 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); + } +#endif + { + MY_CXT_CLONE; +#if A_WORKAROUND_REQUIRE_PROPAGATION + MY_CXT.tbl = t; + MY_CXT.owner = aTHX; +#endif + MY_CXT.seen = ptable_new(); + { + int global_setup; + A_LOADED_LOCK; + global_setup = a_set_loaded_locked(&MY_CXT); + assert(!global_setup); + A_LOADED_UNLOCK; + } + } + XSRETURN(0); + +#endif /* A_THREADSAFE */ + SV * _tag(SV *hint) PROTOTYPE: $