#define A_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
-#undef ENTERn
-#if defined(ENTER_with_name) && !A_HAS_PERL(5, 11, 4)
-# define ENTERn(N) ENTER_with_name(N)
-#else
-# define ENTERn(N) ENTER
-#endif
-
-#undef LEAVEn
-#if defined(LEAVE_with_name) && !A_HAS_PERL(5, 11, 4)
-# define LEAVEn(N) LEAVE_with_name(N)
-#else
-# define LEAVEn(N) LEAVE
-#endif
-
#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
+
/* ... Thread safety and multiplicity ...................................... */
/* Always safe when the workaround isn't needed */
# define A_MULTIPLICITY 0
# endif
#endif
-#if A_MULTIPLICITY && !defined(tTHX)
+
+#ifndef tTHX
# define tTHX PerlInterpreter*
#endif
#define ptable_hints_store(T, K, V) ptable_hints_store(aTHX_ (T), (K), (V))
#define ptable_hints_free(T) ptable_hints_free(aTHX_ (T))
+#endif /* A_THREADSAFE */
+
+#endif /* A_WORKAROUND_REQUIRE_PROPAGATION */
+
+#if !A_HAS_RPEEP
+
+#define PTABLE_NAME ptable_seen
+#define PTABLE_VAL_FREE(V) NOOP
+
+#include "ptable.h"
+
+#endif /* !A_HAS_RPEEP */
+
+#define A_NEED_CXT ((A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION) || !A_HAS_RPEEP)
+
+#if A_NEED_CXT
+
#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
typedef struct {
+#if A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION
ptable *tbl; /* It really is a ptable_hints */
tTHX owner;
+#endif /* A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION */
+#if !A_HAS_RPEEP
+ ptable *seen; /* It really is a ptable_seen */
+#endif /* !A_HAS_RPEEP */
} my_cxt_t;
START_MY_CXT
+#if A_THREADSAFE
+
+#if A_WORKAROUND_REQUIRE_PROPAGATION
+
typedef struct {
ptable *tbl;
#if A_HAS_PERL(5, 13, 2)
ptable_hints_store(ud->tbl, ent->key, h2);
}
+#endif /* A_WORKAROUND_REQUIRE_PROPAGATION */
+
#include "reap.h"
STATIC void a_thread_cleanup(pTHX_ void *ud) {
dMY_CXT;
+#if A_WORKAROUND_REQUIRE_PROPAGATION
ptable_hints_free(MY_CXT.tbl);
+#endif /* A_WORKAROUND_REQUIRE_PROPAGATION */
+#if !A_HAS_RPEEP
+ ptable_seen_free(MY_CXT.seen);
+#endif /* !A_HAS_RPEEP */
}
#endif /* A_THREADSAFE */
+#endif /* A_NEED_CXT */
+
+#if A_WORKAROUND_REQUIRE_PROPAGATION
+
STATIC IV a_require_tag(pTHX) {
#define a_require_tag() a_require_tag(aTHX)
const CV *cv, *outside;
STATIC SV *a_tag(pTHX_ UV bits) {
#define a_tag(B) a_tag(aTHX_ (B))
a_hint_t *h;
+#if A_THREADSAFE
dMY_CXT;
+#endif
h = PerlMemShared_malloc(sizeof *h);
h->bits = bits;
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;
+#endif
if (!(hint && SvIOK(hint)))
return 0;
? SvUVX(H) \
: (SvPOK(H) \
? sv_2uv(SvLEN(H) ? (H) : sv_mortalcopy(H)) \
- : 0 \
+ : 0 \
) \
) \
: 0)
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;
- MUTEX_LOCK(&a_op_map_mutex);
+ A_LOCK(&a_op_map_mutex);
val = ptable_fetch(a_op_map, o);
if (val) {
val = oi;
}
- MUTEX_UNLOCK(&a_op_map_mutex);
+ A_UNLOCK(&a_op_map_mutex);
return val;
}
#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 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
+ A_LOCK(&a_op_map_mutex);
a_map_store_locked(o, old_pp, next, flags);
-#ifdef USE_ITHREADS
- MUTEX_UNLOCK(&a_op_map_mutex);
-#endif
+ A_UNLOCK(&a_op_map_mutex);
}
STATIC void a_map_delete(pTHX_ const OP *o) {
#define a_map_delete(O) a_map_delete(aTHX_ (O))
-#ifdef USE_ITHREADS
- MUTEX_LOCK(&a_op_map_mutex);
-#endif
+ A_LOCK(&a_op_map_mutex);
ptable_map_delete(a_op_map, o);
-#ifdef USE_ITHREADS
- MUTEX_UNLOCK(&a_op_map_mutex);
-#endif
+ A_UNLOCK(&a_op_map_mutex);
}
STATIC const OP *a_map_descend(const OP *o) {
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);
}
}
-#ifdef USE_ITHREADS
- MUTEX_UNLOCK(&a_op_map_mutex);
-#endif
+ A_UNLOCK(&a_op_map_mutex);
return;
}
a_op_info *oi;
const OP *o = root;
-#ifdef USE_ITHREADS
- MUTEX_LOCK(&a_op_map_mutex);
-#endif
+ A_LOCK(&a_op_map_mutex);
flags &= ~A_HINT_ROOT;
o = a_map_descend(o);
} while (o);
-#ifdef USE_ITHREADS
- MUTEX_UNLOCK(&a_op_map_mutex);
-#endif
+ A_UNLOCK(&a_op_map_mutex);
return;
}
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
+ A_LOCK(&a_op_map_mutex);
flags &= ~A_HINT_ROOT;
rflags |= A_HINT_ROOT;
}
oi->flags = rflags;
-#ifdef USE_ITHREADS
- MUTEX_UNLOCK(&a_op_map_mutex);
-#endif
+ A_UNLOCK(&a_op_map_mutex);
return;
}
PUSHs(av);
RETURN;
}
- } else {
- PL_op->op_ppaddr = oi->old_pp;
}
return oi->old_pp(aTHX);
if (oi->flags & A_HINT_DEREF) {
if (a_undef(TOPs))
RETURN;
- } else {
- PL_op->op_ppaddr = oi->old_pp;
}
return oi->old_pp(aTHX);
PUSHs(hv);
RETURN;
}
- } else {
- PL_op->op_ppaddr = oi->old_pp;
}
return oi->old_pp(aTHX);
dSP;
oi = a_map_fetch(PL_op);
- flags = oi->flags;
+ flags = oi->flags;
if (flags & A_HINT_DEREF) {
OP *o;
- U8 old_private;
-deref:
- old_private = PL_op->op_private;
- PL_op->op_private = ((old_private & ~OPpDEREF) | OPpLVAL_DEFER);
o = oi->old_pp(aTHX);
- PL_op->op_private = old_private;
if (flags & (A_HINT_NOTIFY|A_HINT_STORE)) {
SPAGAIN;
}
return o;
- } 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;
}
- /* This op doesn't need to skip autovivification, so restore the original
- * state. */
- PL_op->op_ppaddr = oi->old_pp;
-
return oi->old_pp(aTHX);
}
/* ... 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. 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 OP *(*a_pp_padsv_saved)(pTHX) = 0;
-
-STATIC void a_pp_padsv_save(void) {
- if (a_pp_padsv_saved)
- return;
-
- a_pp_padsv_saved = PL_ppaddr[OP_PADSV];
- PL_ppaddr[OP_PADSV] = a_pp_deref;
-}
-
-STATIC void a_pp_padsv_restore(OP *o) {
- if (!a_pp_padsv_saved)
- return;
-
- if (o->op_ppaddr == a_pp_deref)
- o->op_ppaddr = a_pp_padsv_saved;
-
- PL_ppaddr[OP_PADSV] = a_pp_padsv_saved;
- a_pp_padsv_saved = 0;
-}
+/* 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);
hint = a_hint();
- if (hint & A_HINT_DO) {
- a_pp_padsv_save();
- a_map_store_root(o, a_pp_padsv_saved, hint);
- } else
+ if (hint & A_HINT_DO)
+ a_map_store_root(o, o->op_ppaddr, hint);
+ else
a_map_delete(o);
return o;
STATIC OP *a_ck_padsv(pTHX_ OP *o) {
UV hint;
- a_pp_padsv_restore(o);
-
o = a_old_ck_padsv(aTHX_ o);
hint = a_hint();
return o;
}
+/* ... Our peephole optimizer .............................................. */
+
+STATIC peep_t a_old_peep = 0; /* This is actually the rpeep past 5.13.5 */
+
+#if !A_HAS_RPEEP
+# define A_PEEP_REC_PROTO STATIC void a_peep_rec(pTHX_ OP *o, ptable *seen)
+#else /* !A_HAS_RPEEP */
+# define A_PEEP_REC_PROTO STATIC void a_peep_rec(pTHX_ OP *o)
+#endif /* A_HAS_RPEEP */
+
+A_PEEP_REC_PROTO;
+A_PEEP_REC_PROTO {
+#if !A_HAS_RPEEP
+# define a_peep_rec(O) a_peep_rec(aTHX_ (O), seen)
+#else /* !A_HAS_RPEEP */
+# define a_peep_rec(O) a_peep_rec(aTHX_ (O))
+#endif /* A_HAS_RPEEP */
+ dA_MAP_THX;
+
+#if !A_HAS_RPEEP
+ if (ptable_fetch(seen, o))
+ return;
+#endif
+
+ for (; o; o = o->op_next) {
+ const a_op_info *oi = NULL;
+ UV flags = 0;
+
+#if !A_HAS_RPEEP
+ ptable_seen_store(seen, o, o);
+#endif
+ switch (o->op_type) {
+ 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_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) {
+#if !A_HAS_RPEEP
+ dMY_CXT;
+ ptable *seen = MY_CXT.seen;
+
+ ptable_seen_clear(seen);
+#endif /* !A_HAS_RPEEP */
+
+ a_old_peep(aTHX_ o);
+ a_peep_rec(o);
+}
+
+/* --- Interpreter setup/teardown ------------------------------------------ */
+
STATIC U32 a_initialized = 0;
STATIC void a_teardown(pTHX_ void *root) {
return;
#endif
-#if A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION
+#if A_NEED_CXT
{
dMY_CXT;
+# if A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION
ptable_hints_free(MY_CXT.tbl);
+# endif /* A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION */
+# if !A_HAS_RPEEP
+ ptable_seen_free(MY_CXT.seen);
+# endif /* !A_HAS_RPEEP */
}
-#endif
+#endif /* A_NEED_CXT */
PL_check[OP_PADANY] = MEMBER_TO_FPTR(a_old_ck_padany);
a_old_ck_padany = 0;
PL_check[OP_VALUES] = MEMBER_TO_FPTR(a_old_ck_values);
a_old_ck_values = 0;
- if (a_pp_padsv_saved) {
- PL_ppaddr[OP_PADSV] = a_pp_padsv_saved;
- a_pp_padsv_saved = 0;
- }
+#if A_HAS_RPEEP
+ PL_rpeepp = a_old_peep;
+#else
+ PL_peepp = a_old_peep;
+#endif
+ a_old_peep = 0;
a_initialized = 0;
}
if (a_initialized)
return;
-#if A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION
+#if A_NEED_CXT
{
MY_CXT_INIT;
+# if A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION
MY_CXT.tbl = ptable_new();
MY_CXT.owner = aTHX;
+# endif /* A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION */
+# if !A_HAS_RPEEP
+ MY_CXT.seen = ptable_new();
+# endif /* !A_RPEEP */
}
-#endif
+#endif /* A_NEED_CXT */
a_old_ck_padany = PL_check[OP_PADANY];
PL_check[OP_PADANY] = MEMBER_TO_FPTR(a_ck_padany);
a_old_ck_values = PL_check[OP_VALUES];
PL_check[OP_VALUES] = MEMBER_TO_FPTR(a_ck_root);
+#if A_HAS_RPEEP
+ a_old_peep = PL_rpeepp;
+ PL_rpeepp = a_peep;
+#else
+ a_old_peep = PL_peepp;
+ PL_peepp = a_peep;
+#endif
+
#if A_MULTIPLICITY
call_atexit(a_teardown, aTHX);
#else
PROTOTYPES: ENABLE
-BOOT:
-{
+BOOT:
+{
if (!a_booted++) {
HV *stash;
a_setup();
}
-#if A_THREADSAFE && A_WORKAROUND_REQUIRE_PROPAGATION
+#if A_THREADSAFE && (A_WORKAROUND_REQUIRE_PROPAGATION || !A_HAS_RPEEP)
void
CLONE(...)
PROTOTYPE: DISABLE
PREINIT:
+#if A_WORKAROUND_REQUIRE_PROPAGATION
ptable *t;
+#endif
+#if !A_HAS_RPEEP
+ ptable *s;
+#endif
PPCODE:
{
- a_ptable_clone_ud ud;
dMY_CXT;
+#if A_WORKAROUND_REQUIRE_PROPAGATION
+ {
+ a_ptable_clone_ud ud;
- 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);
+ 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
+#if !A_HAS_RPEEP
+ s = ptable_new();
+#endif
}
{
MY_CXT_CLONE;
+#if A_WORKAROUND_REQUIRE_PROPAGATION
MY_CXT.tbl = t;
MY_CXT.owner = aTHX;
+#endif
+#if !A_HAS_RPEEP
+ MY_CXT.seen = s;
+#endif
}
reap(3, a_thread_cleanup, NULL);
XSRETURN(0);