# define HvNAMELEN_get(H) strlen(HvNAME_get(H))
#endif
-#ifndef SvREFCNT_inc_simple_NN
-# define SvREFCNT_inc_simple_NN SvREFCNT_inc
+#ifndef OpSIBLING
+# ifdef OP_SIBLING
+# define OpSIBLING(O) OP_SIBLING(O)
+# else
+# define OpSIBLING(O) ((O)->op_sibling)
+# endif
+#endif
+
+#ifndef SvREFCNT_inc_simple_void_NN
+# define SvREFCNT_inc_simple_void_NN(S) ((void) SvREFCNT_inc(S))
+#endif
+
+#ifdef DEBUGGING
+# define LT_ASSERT(C) assert(C)
+#else
+# define LT_ASSERT(C)
#endif
/* ... Thread safety and multiplicity ...................................... */
# undef MY_CXT
# define MY_CXT lt_globaldata
# undef START_MY_CXT
-# define START_MY_CXT STATIC my_cxt_t 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 aMY_CXT_
#endif
+#if LT_THREADSAFE
+/* We must use preexistent global mutexes or we will never be able to destroy
+ * them. */
+# if LT_HAS_PERL(5, 9, 3)
+# define LT_LOADED_LOCK MUTEX_LOCK(&PL_my_ctx_mutex)
+# define LT_LOADED_UNLOCK MUTEX_UNLOCK(&PL_my_ctx_mutex)
+# else
+# define LT_LOADED_LOCK OP_REFCNT_LOCK
+# define LT_LOADED_UNLOCK OP_REFCNT_UNLOCK
+# endif
+#else
+# define LT_LOADED_LOCK NOOP
+# define LT_LOADED_UNLOCK NOOP
+#endif
+
+#if defined(OP_CHECK_MUTEX_LOCK) && defined(OP_CHECK_MUTEX_UNLOCK)
+# define LT_CHECK_LOCK OP_CHECK_MUTEX_LOCK
+# define LT_CHECK_UNLOCK OP_CHECK_MUTEX_UNLOCK
+#elif LT_HAS_PERL(5, 9, 3)
+# define LT_CHECK_LOCK OP_REFCNT_LOCK
+# define LT_CHECK_UNLOCK OP_REFCNT_UNLOCK
+#else
+/* Before perl 5.9.3, lt_ck_*() calls are already protected by the LT_LOADED
+ * mutex, which falls back to the OP_REFCNT mutex. Make sure we don't lock it
+ * twice. */
+# define LT_CHECK_LOCK NOOP
+# define LT_CHECK_UNLOCK NOOP
+#endif
+
+typedef OP *(*lt_ck_t)(pTHX_ OP *);
+
+#ifdef wrap_op_checker
+
+# define lt_ck_replace(T, NC, OCP) wrap_op_checker((T), (NC), (OCP))
+
+#else
+
+static void lt_ck_replace(pTHX_ OPCODE type, lt_ck_t new_ck, lt_ck_t *old_ck_p){
+#define lt_ck_replace(T, NC, OCP) lt_ck_replace(aTHX_ (T), (NC), (OCP))
+ LT_CHECK_LOCK;
+ if (!*old_ck_p) {
+ *old_ck_p = PL_check[type];
+ PL_check[type] = new_ck;
+ }
+ LT_CHECK_UNLOCK;
+}
+
+#endif
+
+static void lt_ck_restore(pTHX_ OPCODE type, lt_ck_t *old_ck_p) {
+#define lt_ck_restore(T, OCP) lt_ck_restore(aTHX_ (T), (OCP))
+ LT_CHECK_LOCK;
+ if (*old_ck_p) {
+ PL_check[type] = *old_ck_p;
+ *old_ck_p = 0;
+ }
+ LT_CHECK_UNLOCK;
+}
+
/* --- Helpers ------------------------------------------------------------- */
+/* ... Check if the module is loaded ....................................... */
+
+static I32 lt_loaded = 0;
+
+#if LT_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 *lt_loaded_cxts = NULL;
+
+#ifdef DEBUGGING
+
+static int lt_is_loaded(pTHX_ void *cxt) {
+#define lt_is_loaded(C) lt_is_loaded(aTHX_ (C))
+ int res = 0;
+
+ LT_LOADED_LOCK;
+ if (lt_loaded_cxts && ptable_fetch(lt_loaded_cxts, cxt))
+ res = 1;
+ LT_LOADED_UNLOCK;
+
+ return res;
+}
+
+#endif /* DEBUGGING */
+
+static int lt_set_loaded_locked(pTHX_ void *cxt) {
+#define lt_set_loaded_locked(C) lt_set_loaded_locked(aTHX_ (C))
+ int global_setup = 0;
+
+ if (lt_loaded <= 0) {
+ LT_ASSERT(lt_loaded == 0);
+ LT_ASSERT(!lt_loaded_cxts);
+ lt_loaded_cxts = ptable_new();
+ global_setup = 1;
+ }
+ ++lt_loaded;
+ LT_ASSERT(lt_loaded_cxts);
+ ptable_loaded_store(lt_loaded_cxts, cxt, cxt);
+
+ return global_setup;
+}
+
+static int lt_clear_loaded_locked(pTHX_ void *cxt) {
+#define lt_clear_loaded_locked(C) lt_clear_loaded_locked(aTHX_ (C))
+ int global_teardown = 0;
+
+ if (lt_loaded > 1) {
+ LT_ASSERT(lt_loaded_cxts);
+ ptable_loaded_delete(lt_loaded_cxts, cxt);
+ --lt_loaded;
+ } else if (lt_loaded_cxts) {
+ LT_ASSERT(lt_loaded == 1);
+ ptable_loaded_free(lt_loaded_cxts);
+ lt_loaded_cxts = NULL;
+ lt_loaded = 0;
+ global_teardown = 1;
+ }
+
+ return global_teardown;
+}
+
+#else
+
+#define lt_is_loaded(C) (lt_loaded > 0)
+#define lt_set_loaded_locked(C) ((lt_loaded++ <= 0) ? 1 : 0)
+#define lt_clear_loaded_locked(C) ((--lt_loaded <= 0) ? 1 : 0)
+
+#endif
+
/* ... Thread-safe hints ................................................... */
#if LT_WORKAROUND_REQUIRE_PROPAGATION
#define PTABLE_NAME ptable_hints
#define PTABLE_VAL_FREE(V) LT_HINT_FREE(V)
+#define PTABLE_NEED_DELETE 0
+#define PTABLE_NEED_WALK 1
#define pPTBL pTHX
#define pPTBL_ pTHX_
/* ... "Seen" pointer table ................................................ */
-#if !LT_HAS_RPEEP
-
#define PTABLE_NAME ptable_seen
-#define PTABLE_VAL_FREE(V) NOOP
+#define PTABLE_NEED_DELETE 0
+#define PTABLE_NEED_WALK 0
#include "ptable.h"
-#endif /* !LT_HAS_RPEEP */
+/* 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))
/* ... Global data ......................................................... */
#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
typedef struct {
+ peep_t old_peep;
+ ptable *seen; /* It really is a ptable_seen */
#if LT_THREADSAFE
- ptable *tbl; /* It really is a ptable_hints */
+ ptable *tbl; /* It really is a ptable_hints */
tTHX owner;
-#endif
-#if !LT_HAS_RPEEP
- ptable *seen; /* It really is a ptable_seen */
#endif
SV *default_meth;
} my_cxt_t;
# define lt_dup_inc(S, U) SvREFCNT_inc(sv_dup((S), &((U)->params)))
#endif
-STATIC void lt_ptable_clone(pTHX_ ptable_ent *ent, void *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;
ptable_hints_store(ud->tbl, ent->key, h2);
}
-#include "reap.h"
-
-STATIC void lt_thread_cleanup(pTHX_ void *ud) {
- dMY_CXT;
-
- ptable_hints_free(MY_CXT.tbl);
-#if !LT_HAS_RPEEP
- ptable_seen_free(MY_CXT.seen);
-#endif /* !LT_HAS_RPEEP */
-}
-
#endif /* LT_THREADSAFE */
/* ... Hint tags ........................................................... */
#if LT_WORKAROUND_REQUIRE_PROPAGATION
-STATIC IV lt_require_tag(pTHX) {
+static IV lt_require_tag(pTHX) {
#define lt_require_tag() lt_require_tag(aTHX)
const CV *cv, *outside;
#endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
-STATIC SV *lt_tag(pTHX_ SV *value) {
+static SV *lt_tag(pTHX_ SV *value) {
#define lt_tag(V) lt_tag(aTHX_ (V))
lt_hint_t *h;
- SV *code = NULL;
+ SV *code = NULL;
+#if LT_THREADSAFE
+ dMY_CXT;
+
+ if (!MY_CXT.tbl)
+ return newSViv(0);
+#endif /* LT_THREADSAFE */
if (SvROK(value)) {
value = SvRV(value);
if (SvTYPE(value) >= SVt_PVCV) {
code = value;
- SvREFCNT_inc_simple_NN(code);
+ SvREFCNT_inc_simple_void_NN(code);
}
}
#endif /* !LT_HINT_STRUCT */
#if LT_THREADSAFE
- {
- dMY_CXT;
- /* 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);
- }
+ /* 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 /* LT_THREADSAFE */
return newSViv(PTR2IV(h));
}
-STATIC SV *lt_detag(pTHX_ const SV *hint) {
+static SV *lt_detag(pTHX_ const SV *hint) {
#define lt_detag(H) lt_detag(aTHX_ (H))
lt_hint_t *h;
#if LT_THREADSAFE
dMY_CXT;
-#endif
+
+ if (!MY_CXT.tbl)
+ return NULL;
+#endif /* LT_THREADSAFE */
if (!(hint && SvIOK(hint)))
return NULL;
return LT_HINT_CODE(h);
}
-STATIC U32 lt_hash = 0;
+static VOL U32 lt_hash = 0;
-STATIC SV *lt_hint(pTHX) {
+static SV *lt_hint(pTHX) {
#define lt_hint() lt_hint(aTHX)
SV *hint;
#ifdef cop_hints_fetch_pvn
0,
lt_hash);
#else
- SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, lt_hash);
+ SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, 0);
if (!val)
return 0;
hint = *val;
#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))
-
-STATIC ptable *lt_op_map = NULL;
+#define ptable_map_delete(T, K) ptable_map_delete(aPTBLMS_ (T), (K))
#ifdef USE_ITHREADS
-STATIC perl_mutex lt_op_map_mutex;
+static perl_mutex lt_op_map_mutex;
#define LT_LOCK(M) MUTEX_LOCK(M)
#define LT_UNLOCK(M) MUTEX_UNLOCK(M)
#endif /* !USE_ITHREADS */
+static ptable *lt_op_padxv_map = NULL;
+
typedef struct {
+ OP *(*old_pp)(pTHX);
#ifdef MULTIPLICITY
STRLEN buf_size, orig_pkg_len, type_pkg_len, type_meth_len;
char *buf;
SV *type_pkg;
SV *type_meth;
#endif /* !MULTIPLICITY */
- OP *(*old_pp_padsv)(pTHX);
-} lt_op_info;
+} lt_op_padxv_info;
+
+static void lt_op_padxv_info_call(pTHX_ const lt_op_padxv_info *oi, SV *sv) {
+#define lt_op_padxv_info_call(O, S) lt_op_padxv_info_call(aTHX_ (O), (S))
+ SV *orig_pkg, *type_pkg, *type_meth;
+ int items;
+ dSP;
-STATIC void lt_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*old_pp_padsv)(pTHX)) {
-#define lt_map_store(O, OP, TP, TM, PP) lt_map_store(aTHX_ (O), (OP), (TP), (TM), (PP))
- lt_op_info *oi;
+ ENTER;
+ SAVETMPS;
+
+#ifdef MULTIPLICITY
+ {
+ STRLEN op_len = oi->orig_pkg_len, tp_len = oi->type_pkg_len;
+ char *buf = oi->buf;
+ orig_pkg = sv_2mortal(newSVpvn(buf, op_len));
+ SvREADONLY_on(orig_pkg);
+ buf += op_len;
+ type_pkg = sv_2mortal(newSVpvn(buf, tp_len));
+ SvREADONLY_on(type_pkg);
+ buf += tp_len;
+ type_meth = sv_2mortal(newSVpvn(buf, oi->type_meth_len));
+ SvREADONLY_on(type_meth);
+ }
+#else /* MULTIPLICITY */
+ orig_pkg = oi->orig_pkg;
+ type_pkg = oi->type_pkg;
+ type_meth = oi->type_meth;
+#endif /* !MULTIPLICITY */
+
+ PUSHMARK(SP);
+ EXTEND(SP, 3);
+ PUSHs(type_pkg);
+ PUSHs(sv);
+ PUSHs(orig_pkg);
+ PUTBACK;
+
+ items = call_sv(type_meth, G_ARRAY | G_METHOD);
+
+ SPAGAIN;
+ switch (items) {
+ case 0:
+ break;
+ case 1:
+ sv_setsv(sv, POPs);
+ break;
+ default:
+ croak("Typed scalar initializer method should return zero or one scalar, but got %d", items);
+ }
+ PUTBACK;
+
+ FREETMPS;
+ LEAVE;
+
+ return;
+}
+
+static void lt_padxv_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*old_pp)(pTHX)) {
+#define lt_padxv_map_store(O, OP, TP, TM, PP) lt_padxv_map_store(aTHX_ (O), (OP), (TP), (TM), (PP))
+ lt_op_padxv_info *oi;
LT_LOCK(<_op_map_mutex);
- if (!(oi = ptable_fetch(lt_op_map, o))) {
+ if (!(oi = ptable_fetch(lt_op_padxv_map, o))) {
oi = PerlMemShared_malloc(sizeof *oi);
- ptable_map_store(lt_op_map, o, oi);
+ ptable_map_store(lt_op_padxv_map, o, oi);
#ifdef MULTIPLICITY
oi->buf = NULL;
oi->buf_size = 0;
oi->type_meth = type_meth;
#endif /* !MULTIPLICITY */
- oi->old_pp_padsv = old_pp_padsv;
+ oi->old_pp = old_pp;
LT_UNLOCK(<_op_map_mutex);
}
-STATIC const lt_op_info *lt_map_fetch(const OP *o, lt_op_info *oi) {
- const lt_op_info *val;
+static const lt_op_padxv_info *lt_padxv_map_fetch(const OP *o, lt_op_padxv_info *oi) {
+ const lt_op_padxv_info *val;
LT_LOCK(<_op_map_mutex);
- val = ptable_fetch(lt_op_map, o);
+ val = ptable_fetch(lt_op_padxv_map, o);
if (val) {
*oi = *val;
val = oi;
return val;
}
-STATIC void lt_map_delete(pTHX_ const OP *o) {
+#if LT_HAS_PERL(5, 17, 6)
+
+static ptable *lt_op_padrange_map = NULL;
+
+typedef struct {
+ OP *(*old_pp)(pTHX);
+ const OP *padxv_start;
+} lt_op_padrange_info;
+
+static void lt_padrange_map_store(pTHX_ const OP *o, const OP *s, OP *(*old_pp)(pTHX)) {
+#define lt_padrange_map_store(O, S, PP) lt_padrange_map_store(aTHX_ (O), (S), (PP))
+ lt_op_padrange_info *oi;
+
+ LT_LOCK(<_op_map_mutex);
+
+ if (!(oi = ptable_fetch(lt_op_padrange_map, o))) {
+ oi = PerlMemShared_malloc(sizeof *oi);
+ ptable_map_store(lt_op_padrange_map, o, oi);
+ }
+
+ oi->old_pp = old_pp;
+ oi->padxv_start = s;
+
+ LT_UNLOCK(<_op_map_mutex);
+}
+
+static const lt_op_padrange_info *lt_padrange_map_fetch(const OP *o, lt_op_padrange_info *oi) {
+ const lt_op_padrange_info *val;
+
+ LT_LOCK(<_op_map_mutex);
+
+ val = ptable_fetch(lt_op_padrange_map, o);
+ if (val) {
+ *oi = *val;
+ val = oi;
+ }
+
+ LT_UNLOCK(<_op_map_mutex);
+
+ return val;
+}
+
+#endif
+
+static void lt_map_delete(pTHX_ const OP *o) {
#define lt_map_delete(O) lt_map_delete(aTHX_ (O))
LT_LOCK(<_op_map_mutex);
- ptable_map_delete(lt_op_map, o);
+ ptable_map_delete(lt_op_padxv_map, o);
+#if LT_HAS_PERL(5, 17, 6)
+ ptable_map_delete(lt_op_padrange_map, o);
+#endif
LT_UNLOCK(<_op_map_mutex);
}
/* ... Our pp_padsv ........................................................ */
-STATIC OP *lt_pp_padsv(pTHX) {
- lt_op_info oi;
+static OP *lt_pp_padsv(pTHX) {
+ lt_op_padxv_info oi;
- if (lt_map_fetch(PL_op, &oi)) {
- SV *orig_pkg, *type_pkg, *type_meth;
- int items;
- dSP;
+ if (lt_padxv_map_fetch(PL_op, &oi)) {
dTARGET;
+ lt_op_padxv_info_call(&oi, TARG);
+ return oi.old_pp(aTHX);
+ }
- ENTER;
- SAVETMPS;
+ return PL_op->op_ppaddr(aTHX);
+}
-#ifdef MULTIPLICITY
- {
- STRLEN op_len = oi.orig_pkg_len, tp_len = oi.type_pkg_len;
- char *buf = oi.buf;
- orig_pkg = sv_2mortal(newSVpvn(buf, op_len));
- SvREADONLY_on(orig_pkg);
- buf += op_len;
- type_pkg = sv_2mortal(newSVpvn(buf, tp_len));
- SvREADONLY_on(type_pkg);
- buf += tp_len;
- type_meth = sv_2mortal(newSVpvn(buf, oi.type_meth_len));
- SvREADONLY_on(type_meth);
- }
-#else /* MULTIPLICITY */
- orig_pkg = oi.orig_pkg;
- type_pkg = oi.type_pkg;
- type_meth = oi.type_meth;
-#endif /* !MULTIPLICITY */
+/* ... Our pp_padrange (on perl 5.17.6 and above) .......................... */
- PUSHMARK(SP);
- EXTEND(SP, 3);
- PUSHs(type_pkg);
- PUSHTARG;
- PUSHs(orig_pkg);
- PUTBACK;
+#if LT_HAS_PERL(5, 17, 6)
- items = call_sv(type_meth, G_ARRAY | G_METHOD);
+static OP *lt_pp_padrange(pTHX) {
+ lt_op_padrange_info roi;
- SPAGAIN;
- switch (items) {
- case 0:
- break;
- case 1:
- sv_setsv(TARG, POPs);
- break;
- default:
- croak("Typed scalar initializer method should return zero or one scalar, but got %d", items);
- }
- PUTBACK;
+ if (lt_padrange_map_fetch(PL_op, &roi)) {
+ PADOFFSET i, base, count;
+ const OP *p;
- FREETMPS;
- LEAVE;
+ base = PL_op->op_targ;
+ count = PL_op->op_private & OPpPADRANGE_COUNTMASK;
+
+ for (i = 0, p = roi.padxv_start; i < count && p; ++i, p = p->op_next) {
+ while (p->op_type == OP_NULL)
+ p = p->op_next;
+ lt_op_padxv_info oi;
+ if (p->op_type == OP_PADSV && lt_padxv_map_fetch(p, &oi))
+ lt_op_padxv_info_call(&oi, PAD_SV(base + i));
+ }
- return oi.old_pp_padsv(aTHX);
+ return roi.old_pp(aTHX);
}
return PL_op->op_ppaddr(aTHX);
}
+#endif
+
/* ... Our ck_pad{any,sv} .................................................. */
/* Sadly, the padsv OPs we are interested in don't trigger the padsv check
* 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 *(*lt_old_ck_padany)(pTHX_ OP *) = 0;
+static OP *(*lt_old_ck_padany)(pTHX_ OP *) = 0;
-STATIC OP *lt_ck_padany(pTHX_ OP *o) {
+static OP *lt_ck_padany(pTHX_ OP *o) {
HV *stash;
SV *code;
if (stash && (code = lt_hint())) {
dMY_CXT;
SV *orig_pkg = newSVpvn(HvNAME_get(stash), HvNAMELEN_get(stash));
- SV *orig_meth = MY_CXT.default_meth;
+ SV *orig_meth = MY_CXT.default_meth; /* Guarded by lt_hint() */
SV *type_pkg = NULL;
SV *type_meth = NULL;
int items;
if (!type_pkg) {
type_pkg = orig_pkg;
- SvREFCNT_inc(orig_pkg);
+ SvREFCNT_inc_simple_void_NN(orig_pkg);
}
if (!type_meth) {
type_meth = orig_meth;
- SvREFCNT_inc(orig_meth);
+ SvREFCNT_inc_simple_void_NN(orig_meth);
}
- lt_map_store(o, orig_pkg, type_pkg, type_meth, o->op_ppaddr);
+ lt_padxv_map_store(o, orig_pkg, type_pkg, type_meth, o->op_ppaddr);
} else {
skip:
lt_map_delete(o);
return o;
}
-STATIC OP *(*lt_old_ck_padsv)(pTHX_ OP *) = 0;
+static OP *(*lt_old_ck_padsv)(pTHX_ OP *) = 0;
-STATIC OP *lt_ck_padsv(pTHX_ OP *o) {
+static OP *lt_ck_padsv(pTHX_ OP *o) {
lt_map_delete(o);
return lt_old_ck_padsv(aTHX_ o);
/* ... Our peephole optimizer .............................................. */
-STATIC peep_t lt_old_peep = 0; /* This is actually the rpeep past 5.13.5 */
-
-#if !LT_HAS_RPEEP
-# define LT_PEEP_REC_PROTO STATIC void lt_peep_rec(pTHX_ OP *o, ptable *seen)
-#else /* !LT_HAS_RPEEP */
-# define LT_PEEP_REC_PROTO STATIC void lt_peep_rec(pTHX_ OP *o)
-#endif /* LT_HAS_RPEEP */
+#if LT_HAS_PERL(5, 17, 6)
+
+static int lt_maybe_padrange_setup(pTHX_ OP *o, const OP *start) {
+#define lt_maybe_padrange_setup(O, S) lt_maybe_padrange_setup(aTHX_ (O), (S))
+ PADOFFSET i, count;
+ const OP *p;
+
+ count = o->op_private & OPpPADRANGE_COUNTMASK;
+
+ for (i = 0, p = start; i < count && p; ++i, p = p->op_next) {
+ if (p->op_type == OP_PADSV) {
+ /* In a padrange sequence, either all lexicals are typed, or none are.
+ * Thus we can stop at the first padsv op. However, note that these
+ * lexicals can need to call different methods in different packages. */
+ LT_LOCK(<_op_map_mutex);
+ if (ptable_fetch(lt_op_padxv_map, p)) {
+ LT_UNLOCK(<_op_map_mutex);
+ lt_padrange_map_store(o, start, o->op_ppaddr);
+ o->op_ppaddr = lt_pp_padrange;
+ } else {
+ LT_UNLOCK(<_op_map_mutex);
+ }
+ return 1;
+ }
+ }
-LT_PEEP_REC_PROTO;
-LT_PEEP_REC_PROTO {
-#if !LT_HAS_RPEEP
-# define lt_peep_rec(O) lt_peep_rec(aTHX_ (O), seen)
-#else /* !LT_HAS_RPEEP */
-# define lt_peep_rec(O) lt_peep_rec(aTHX_ (O))
-#endif /* LT_HAS_RPEEP */
+ return 0;
+}
-#if !LT_HAS_RPEEP
- if (ptable_fetch(seen, o))
- return;
#endif
+static void lt_peep_rec(pTHX_ OP *o, ptable *seen) {
+#define lt_peep_rec(O) lt_peep_rec(aTHX_ (O), seen)
for (; o; o = o->op_next) {
- lt_op_info *oi = NULL;
-
-#if !LT_HAS_RPEEP
+ if (ptable_fetch(seen, o))
+ break;
ptable_seen_store(seen, o, o);
-#endif
+
switch (o->op_type) {
case OP_PADSV:
if (o->op_ppaddr != lt_pp_padsv && o->op_private & OPpLVAL_INTRO) {
+ lt_op_padxv_info *oi;
LT_LOCK(<_op_map_mutex);
- oi = ptable_fetch(lt_op_map, o);
+ oi = ptable_fetch(lt_op_padxv_map, o);
if (oi) {
- oi->old_pp_padsv = o->op_ppaddr;
- o->op_ppaddr = lt_pp_padsv;
+ oi->old_pp = o->op_ppaddr;
+ o->op_ppaddr = lt_pp_padsv;
}
LT_UNLOCK(<_op_map_mutex);
}
break;
+#if LT_HAS_PERL(5, 17, 6)
+ case OP_PADRANGE:
+ /* We deal with special padrange ops later, in the aassign op they belong
+ * to. */
+ if (o->op_ppaddr != lt_pp_padrange && o->op_private & OPpLVAL_INTRO
+ && !(o->op_flags & OPf_SPECIAL)) {
+ /* A padrange op is guaranteed to have previously been a pushmark.
+ * Moreover, for non-special padrange ops (i.e. that aren't for
+ * my (...) = @_), the first original padxv is its sibling or nephew.
+ */
+ OP *kid = OpSIBLING(o);
+ if (kid->op_type == OP_NULL && kid->op_flags & OPf_KIDS) {
+ kid = kUNOP->op_first;
+ if (kid->op_type == OP_NULL)
+ kid = OpSIBLING(kid);
+ }
+ lt_maybe_padrange_setup(o, kid);
+ }
+ break;
+ case OP_AASSIGN: {
+ OP *op;
+ if (cBINOPo->op_first && cBINOPo->op_first->op_flags & OPf_KIDS
+ && (op = cUNOPx(cBINOPo->op_first)->op_first)
+ && op->op_type == OP_PADRANGE
+ && op->op_ppaddr != lt_pp_padrange
+ && op->op_private & OPpLVAL_INTRO
+ && op->op_flags & OPf_SPECIAL) {
+ const OP *start = cUNOPx(cBINOPo->op_last)->op_first;
+ if (start->op_type == OP_PUSHMARK)
+ start = OpSIBLING(start);
+ lt_maybe_padrange_setup(op, start);
+ }
+ break;
+ }
+#endif
#if !LT_HAS_RPEEP
case OP_MAPWHILE:
case OP_GREPWHILE:
}
}
-STATIC void lt_peep(pTHX_ OP *o) {
-#if !LT_HAS_RPEEP
+static void lt_peep(pTHX_ OP *o) {
+ ptable *seen;
dMY_CXT;
- ptable *seen = MY_CXT.seen;
- ptable_seen_clear(seen);
-#endif /* !LT_HAS_RPEEP */
+ LT_ASSERT(lt_is_loaded(&MY_CXT));
- lt_old_peep(aTHX_ o);
- lt_peep_rec(o);
+ MY_CXT.old_peep(aTHX_ o);
+
+ seen = MY_CXT.seen;
+ if (seen) {
+ ptable_seen_clear(seen);
+ lt_peep_rec(o);
+ ptable_seen_clear(seen);
+ }
}
-/* --- Interpreter setup/teardown ------------------------------------------ */
+/* --- Module setup/teardown ----------------------------------------------- */
+static void lt_teardown(pTHX_ void *root) {
+ dMY_CXT;
-STATIC U32 lt_initialized = 0;
+ LT_LOADED_LOCK;
-STATIC void lt_teardown(pTHX_ void *root) {
- if (!lt_initialized)
- return;
+ if (lt_clear_loaded_locked(&MY_CXT)) {
+ lt_ck_restore(OP_PADANY, <_old_ck_padany);
+ lt_ck_restore(OP_PADSV, <_old_ck_padsv);
-#if LT_MULTIPLICITY
- if (aTHX != root)
- return;
-#endif
+ ptable_map_free(lt_op_padxv_map);
+ lt_op_padxv_map = NULL;
- {
- dMY_CXT;
-#if LT_THREADSAFE
- ptable_hints_free(MY_CXT.tbl);
+#if LT_HAS_PERL(5, 17, 6)
+ ptable_map_free(lt_op_padrange_map);
+ lt_op_padrange_map = NULL;
#endif
-#if !LT_HAS_RPEEP
- ptable_seen_free(MY_CXT.seen);
+
+#ifdef USE_ITHREADS
+ MUTEX_DESTROY(<_op_map_mutex);
#endif
- SvREFCNT_dec(MY_CXT.default_meth);
}
- PL_check[OP_PADANY] = MEMBER_TO_FPTR(lt_old_ck_padany);
- lt_old_ck_padany = 0;
- PL_check[OP_PADSV] = MEMBER_TO_FPTR(lt_old_ck_padsv);
- lt_old_ck_padsv = 0;
+ LT_LOADED_UNLOCK;
+ if (MY_CXT.old_peep) {
#if LT_HAS_RPEEP
- PL_rpeepp = lt_old_peep;
+ PL_rpeepp = MY_CXT.old_peep;
#else
- PL_peepp = lt_old_peep;
+ PL_peepp = MY_CXT.old_peep;
+#endif
+ MY_CXT.old_peep = 0;
+ }
+
+ ptable_seen_free(MY_CXT.seen);
+ MY_CXT.seen = NULL;
+
+#if LT_THREADSAFE
+ ptable_hints_free(MY_CXT.tbl);
+ MY_CXT.tbl = NULL;
#endif
- lt_old_peep = 0;
- lt_initialized = 0;
+ SvREFCNT_dec(MY_CXT.default_meth);
+ MY_CXT.default_meth = NULL;
+
+ return;
}
-STATIC void lt_setup(pTHX) {
+static void lt_setup(pTHX) {
#define lt_setup() lt_setup(aTHX)
- if (lt_initialized)
- return;
+ MY_CXT_INIT; /* Takes/release PL_my_ctx_mutex */
- {
- MY_CXT_INIT;
-#if LT_THREADSAFE
- MY_CXT.tbl = ptable_new();
- MY_CXT.owner = aTHX;
+ LT_LOADED_LOCK;
+
+ if (lt_set_loaded_locked(&MY_CXT)) {
+ PERL_HASH(lt_hash, __PACKAGE__, __PACKAGE_LEN__);
+
+ lt_op_padxv_map = ptable_new();
+#if LT_HAS_PERL(5, 17, 6)
+ lt_op_padrange_map = ptable_new();
#endif
-#if !LT_HAS_RPEEP
- MY_CXT.seen = ptable_new();
+
+#ifdef USE_ITHREADS
+ MUTEX_INIT(<_op_map_mutex);
#endif
- MY_CXT.default_meth = newSVpvn("TYPEDSCALAR", 11);
- SvREADONLY_on(MY_CXT.default_meth);
+
+ lt_ck_replace(OP_PADANY, lt_ck_padany, <_old_ck_padany);
+ lt_ck_replace(OP_PADSV, lt_ck_padsv, <_old_ck_padsv);
}
- lt_old_ck_padany = PL_check[OP_PADANY];
- PL_check[OP_PADANY] = MEMBER_TO_FPTR(lt_ck_padany);
- lt_old_ck_padsv = PL_check[OP_PADSV];
- PL_check[OP_PADSV] = MEMBER_TO_FPTR(lt_ck_padsv);
+ LT_LOADED_UNLOCK;
+
+ {
+ HV *stash;
+
+ stash = gv_stashpvn(__PACKAGE__, __PACKAGE_LEN__, 1);
+ newCONSTSUB(stash, "LT_THREADSAFE", newSVuv(LT_THREADSAFE));
+ newCONSTSUB(stash, "LT_FORKSAFE", newSVuv(LT_FORKSAFE));
+ }
#if LT_HAS_RPEEP
- lt_old_peep = PL_rpeepp;
- PL_rpeepp = lt_peep;
+ if (PL_rpeepp != lt_peep) {
+ MY_CXT.old_peep = PL_rpeepp;
+ PL_rpeepp = lt_peep;
+ }
#else
- lt_old_peep = PL_peepp;
- PL_peepp = lt_peep;
+ if (PL_peepp != lt_peep) {
+ MY_CXT.old_peep = PL_peepp;
+ PL_peepp = lt_peep;
+ }
+#endif
+ else {
+ MY_CXT.old_peep = 0;
+ }
+
+ MY_CXT.seen = ptable_new();
+
+#if LT_THREADSAFE
+ MY_CXT.tbl = ptable_new();
+ MY_CXT.owner = aTHX;
#endif
-#if LT_MULTIPLICITY
- call_atexit(lt_teardown, aTHX);
-#else
+ MY_CXT.default_meth = newSVpvn("TYPEDSCALAR", 11);
+ SvREADONLY_on(MY_CXT.default_meth);
+
call_atexit(lt_teardown, NULL);
-#endif
- lt_initialized = 1;
+ return;
}
-STATIC U32 lt_booted = 0;
-
/* --- XS ------------------------------------------------------------------ */
MODULE = Lexical::Types PACKAGE = Lexical::Types
BOOT:
{
- if (!lt_booted++) {
- HV *stash;
-
- lt_op_map = ptable_new();
-#ifdef USE_ITHREADS
- MUTEX_INIT(<_op_map_mutex);
-#endif
-
- PERL_HASH(lt_hash, __PACKAGE__, __PACKAGE_LEN__);
-
- stash = gv_stashpvn(__PACKAGE__, __PACKAGE_LEN__, 1);
- newCONSTSUB(stash, "LT_THREADSAFE", newSVuv(LT_THREADSAFE));
- newCONSTSUB(stash, "LT_FORKSAFE", newSVuv(LT_FORKSAFE));
- }
-
lt_setup();
}
PROTOTYPE: DISABLE
PREINIT:
ptable *t;
-#if !LT_HAS_RPEEP
ptable *s;
-#endif
SV *cloned_default_meth;
PPCODE:
{
cloned_default_meth = lt_dup_inc(MY_CXT.default_meth, &ud);
lt_ptable_clone_ud_deinit(ud);
}
-#if !LT_HAS_RPEEP
s = ptable_new();
-#endif
}
{
MY_CXT_CLONE;
+ MY_CXT.seen = s;
MY_CXT.tbl = t;
MY_CXT.owner = aTHX;
-#if !LT_HAS_RPEEP
- MY_CXT.seen = s;
-#endif
MY_CXT.default_meth = cloned_default_meth;
+ {
+ int global_setup;
+ LT_LOADED_LOCK;
+ global_setup = lt_set_loaded_locked(&MY_CXT);
+ LT_ASSERT(!global_setup);
+ LT_LOADED_UNLOCK;
+ }
}
- reap(3, lt_thread_cleanup, NULL);
XSRETURN(0);
#endif
projects / perl / modules / Lexical-Types.git / blobdiff