#include "perl.h"
#include "XSUB.h"
-#define __PACKAGE__ "Lexical::Types"
-#define __PACKAGE_LEN__ (sizeof(__PACKAGE__)-1)
+/* --- XS helpers ---------------------------------------------------------- */
-/* --- Compatibility wrappers ---------------------------------------------- */
-
-#define LT_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
-
-#if LT_HAS_PERL(5, 10, 0) || defined(PL_parser)
-# ifndef PL_in_my_stash
-# define PL_in_my_stash PL_parser->in_my_stash
-# endif
-#else
-# ifndef PL_in_my_stash
-# define PL_in_my_stash PL_Iin_my_stash
-# endif
-#endif
-
-#ifndef LT_WORKAROUND_REQUIRE_PROPAGATION
-# define LT_WORKAROUND_REQUIRE_PROPAGATION !LT_HAS_PERL(5, 10, 1)
-#endif
-
-#ifndef HvNAME_get
-# define HvNAME_get(H) HvNAME(H)
-#endif
-
-#ifndef HvNAMELEN_get
-# define HvNAMELEN_get(H) strlen(HvNAME_get(H))
-#endif
-
-#ifndef SvREFCNT_inc_simple_NN
-# define SvREFCNT_inc_simple_NN SvREFCNT_inc
-#endif
-
-/* ... Thread safety and multiplicity ...................................... */
-
-#ifndef LT_MULTIPLICITY
-# if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
-# define LT_MULTIPLICITY 1
-# else
-# define LT_MULTIPLICITY 0
-# endif
-#endif
-#if LT_MULTIPLICITY && !defined(tTHX)
-# define tTHX PerlInterpreter*
-#endif
+#define XSH_PACKAGE "Lexical::Types"
-#if LT_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 LT_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 LT_THREADSAFE 0
-# undef dMY_CXT
-# define dMY_CXT dNOOP
-# undef MY_CXT
-# define MY_CXT lt_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
-# undef pMY_CXT
-# define pMY_CXT
-# undef pMY_CXT_
-# define pMY_CXT_
-# undef aMY_CXT
-# define aMY_CXT
-# undef aMY_CXT_
-# define aMY_CXT_
-#endif
-
-/* --- Helpers ------------------------------------------------------------- */
-
-/* ... Thread-safe hints ................................................... */
-
-#if LT_WORKAROUND_REQUIRE_PROPAGATION
-
-typedef struct {
- SV *code;
- IV require_tag;
-} lt_hint_t;
-
-#define LT_HINT_STRUCT 1
-
-#define LT_HINT_CODE(H) ((H)->code)
-
-#define LT_HINT_FREE(H) { \
- lt_hint_t *h = (H); \
- SvREFCNT_dec(h->code); \
- PerlMemShared_free(h); \
-}
-
-#else /* LT_WORKAROUND_REQUIRE_PROPAGATION */
+#include "xsh/caps.h"
+#include "xsh/util.h"
+#include "xsh/mem.h"
+#include "xsh/ops.h"
+#include "xsh/peep.h"
-typedef SV lt_hint_t;
+/* ... Lexical hints ....................................................... */
-#define LT_HINT_STRUCT 0
+#define XSH_HINTS_TYPE_SV 1
-#define LT_HINT_CODE(H) (H)
+#include "xsh/hints.h"
-#define LT_HINT_FREE(H) SvREFCNT_dec(H);
+#define lt_hint() xsh_hints_detag(xsh_hints_fetch())
-#endif /* !LT_WORKAROUND_REQUIRE_PROPAGATION */
-
-#if LT_THREADSAFE
-
-#define PTABLE_NAME ptable_hints
-#define PTABLE_VAL_FREE(V) LT_HINT_FREE(V)
-
-#define pPTBL pTHX
-#define pPTBL_ pTHX_
-#define aPTBL aTHX
-#define aPTBL_ aTHX_
-
-#include "ptable.h"
-
-#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 /* LT_THREADSAFE */
-
-/* ... Global data ......................................................... */
-
-#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
+/* ... Thread-local storage ................................................ */
typedef struct {
-#if LT_THREADSAFE
- ptable *tbl; /* It really is a ptable_hints */
- tTHX owner;
-#endif
- SV *default_meth;
- OP * (*pp_padsv_saved)(pTHX);
-} my_cxt_t;
-
-START_MY_CXT
-
-/* ... Cloning global data ................................................. */
+ SV *default_meth;
+} xsh_user_cxt_t;
-#if LT_THREADSAFE
+#define XSH_THREADS_COMPILE_TIME_PROTECTION 1
+#define XSH_THREADS_USER_CLONE_NEEDS_DUP 1
-STATIC SV *lt_clone(pTHX_ SV *sv, tTHX owner) {
-#define lt_clone(S, O) lt_clone(aTHX_ (S), (O))
- CLONE_PARAMS param;
- AV *stashes = NULL;
- SV *dupsv;
+#if XSH_THREADSAFE
- if (SvTYPE(sv) == SVt_PVHV && HvNAME_get(sv))
- stashes = newAV();
+static void xsh_user_clone(pTHX_ const xsh_user_cxt_t *old_cxt, xsh_user_cxt_t *new_cxt, CLONE_PARAMS *params) {
+ new_cxt->default_meth = xsh_dup_inc(old_cxt->default_meth, params);
- param.stashes = stashes;
- param.flags = 0;
- param.proto_perl = owner;
-
- dupsv = sv_dup(sv, ¶m);
-
- if (stashes) {
- av_undef(stashes);
- SvREFCNT_dec(stashes);
- }
-
- return SvREFCNT_inc(dupsv);
-}
-
-STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) {
- my_cxt_t *ud = ud_;
- lt_hint_t *h1 = ent->val;
- lt_hint_t *h2;
-
- if (ud->owner == aTHX)
- return;
-
-#if LT_HINT_STRUCT
-
- h2 = PerlMemShared_malloc(sizeof *h2);
- h2->code = lt_clone(h1->code, ud->owner);
- SvREFCNT_inc(h2->code);
-#if LT_WORKAROUND_REQUIRE_PROPAGATION
- h2->require_tag = PTR2IV(lt_clone(INT2PTR(SV *, h1->require_tag), ud->owner));
-#endif
-
-#else /* LT_HINT_STRUCT */
-
- h2 = lt_clone(h1, ud->owner);
- SvREFCNT_inc(h2);
-
-#endif /* !LT_HINT_STRUCT */
-
- 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);
-}
-
-#endif /* LT_THREADSAFE */
-
-/* ... Hint tags ........................................................... */
-
-#if LT_WORKAROUND_REQUIRE_PROPAGATION
-STATIC IV lt_require_tag(pTHX) {
-#define lt_require_tag() lt_require_tag(aTHX)
- const CV *cv, *outside;
-
- 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;
-
- 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;
-
- 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);
-}
-#endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
-
-STATIC SV *lt_tag(pTHX_ SV *value) {
-#define lt_tag(V) lt_tag(aTHX_ (V))
- lt_hint_t *h;
- SV *code = NULL;
- dMY_CXT;
-
- if (SvROK(value)) {
- value = SvRV(value);
- if (SvTYPE(value) >= SVt_PVCV) {
- code = value;
- SvREFCNT_inc_simple_NN(code);
- }
- }
-
-#if LT_HINT_STRUCT
- h = PerlMemShared_malloc(sizeof *h);
- h->code = code;
-# if LT_WORKAROUND_REQUIRE_PROPAGATION
- h->require_tag = lt_require_tag();
-# endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
-#else /* LT_HINT_STRUCT */
- h = code;
-#endif /* !LT_HINT_STRUCT */
-
-#if LT_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 /* LT_THREADSAFE */
-
- return newSViv(PTR2IV(h));
+ return;
}
-STATIC SV *lt_detag(pTHX_ const SV *hint) {
-#define lt_detag(H) lt_detag(aTHX_ (H))
- lt_hint_t *h;
- dMY_CXT;
+#endif /* XSH_THREADSAFE */
- if (!(hint && SvIOK(hint)))
- return NULL;
+#include "xsh/threads.h"
- h = INT2PTR(lt_hint_t *, SvIVX(hint));
-#if LT_THREADSAFE
- h = ptable_fetch(MY_CXT.tbl, h);
-#endif /* LT_THREADSAFE */
-#if LT_WORKAROUND_REQUIRE_PROPAGATION
- if (lt_require_tag() != h->require_tag)
- return NULL;
-#endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
+/* ... op => info map ...................................................... */
- return LT_HINT_CODE(h);
-}
+#define PTABLE_NAME ptable_map
+#define PTABLE_VAL_FREE(V) XSH_SHARED_FREE((V), 0, char)
+#define PTABLE_VAL_NEED_CONTEXT 0
+#define PTABLE_NEED_DELETE 1
+#define PTABLE_NEED_WALK 0
-STATIC U32 lt_hash = 0;
-
-STATIC SV *lt_hint(pTHX) {
-#define lt_hint() lt_hint(aTHX)
- SV *hint;
-#if LT_HAS_PERL(5, 9, 5)
- hint = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
- NULL,
- __PACKAGE__, __PACKAGE_LEN__,
- 0,
- lt_hash);
-#else
- SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, lt_hash);
- if (!val)
- return 0;
- hint = *val;
-#endif
- return lt_detag(hint);
-}
-
-/* ... op => info map ...................................................... */
+#include "xsh/ptable.h"
-#define PTABLE_NAME ptable_map
-#define PTABLE_VAL_FREE(V) PerlMemShared_free(V)
+#define ptable_map_store(T, K, V) ptable_map_store(aPMS_ (T), (K), (V))
+#define ptable_map_delete(T, K) ptable_map_delete(aPMS_ (T), (K))
+#define ptable_map_free(T) ptable_map_free(aPMS_ (T))
-#include "ptable.h"
+#ifdef USE_ITHREADS
-/* PerlMemShared_free() needs the [ap]PTBLMS_? default values */
-#define ptable_map_store(T, K, V) ptable_map_store(aPTBLMS_ (T), (K), (V))
+static perl_mutex lt_op_map_mutex;
-STATIC ptable *lt_op_map = NULL;
+#endif /* USE_ITHREADS */
-#ifdef USE_ITHREADS
-STATIC perl_mutex lt_op_map_mutex;
-#endif
+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_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;
+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;
-#ifdef USE_ITHREADS
- MUTEX_LOCK(<_op_map_mutex);
-#endif
+ ENTER;
+ SAVETMPS;
- if (!(oi = ptable_fetch(lt_op_map, o))) {
- oi = PerlMemShared_malloc(sizeof *oi);
- ptable_map_store(lt_op_map, o, oi);
+#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;
+
+ XSH_LOCK(<_op_map_mutex);
+
+ if (!(oi = ptable_fetch(lt_op_padxv_map, o))) {
+ XSH_SHARED_ALLOC(oi, 1, lt_op_padxv_info);
+ ptable_map_store(lt_op_padxv_map, o, oi);
#ifdef MULTIPLICITY
oi->buf = NULL;
oi->buf_size = 0;
STRLEN new_buf_size = op_len + tp_len + tm_len;
char *buf;
if (new_buf_size > oi->buf_size) {
- PerlMemShared_free(oi->buf);
- oi->buf = PerlMemShared_malloc(new_buf_size);
+ XSH_SHARED_REALLOC(oi->buf, oi->buf_size, new_buf_size, char);
oi->buf_size = new_buf_size;
}
buf = oi->buf;
oi->type_meth = type_meth;
#endif /* !MULTIPLICITY */
- oi->old_pp_padsv = old_pp_padsv;
+ oi->old_pp = old_pp;
-#ifdef USE_ITHREADS
- MUTEX_UNLOCK(<_op_map_mutex);
-#endif
+ XSH_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;
-#ifdef USE_ITHREADS
- MUTEX_LOCK(<_op_map_mutex);
-#endif
+ XSH_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;
}
-#ifdef USE_ITHREADS
- MUTEX_UNLOCK(<_op_map_mutex);
-#endif
+ XSH_UNLOCK(<_op_map_mutex);
+
+ return val;
+}
+
+#if XSH_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;
+
+ XSH_LOCK(<_op_map_mutex);
+
+ if (!(oi = ptable_fetch(lt_op_padrange_map, o))) {
+ XSH_SHARED_ALLOC(oi, 1, lt_op_padrange_info);
+ ptable_map_store(lt_op_padrange_map, o, oi);
+ }
+
+ oi->old_pp = old_pp;
+ oi->padxv_start = s;
+
+ XSH_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;
+
+ XSH_LOCK(<_op_map_mutex);
+
+ val = ptable_fetch(lt_op_padrange_map, o);
+ if (val) {
+ *oi = *val;
+ val = oi;
+ }
+
+ XSH_UNLOCK(<_op_map_mutex);
return val;
}
-STATIC void lt_map_delete(pTHX_ const OP *o) {
-#define lt_map_delete(O) lt_map_delete(aTHX_ (O))
-#ifdef USE_ITHREADS
- MUTEX_LOCK(<_op_map_mutex);
#endif
- ptable_map_store(lt_op_map, o, NULL);
+static void lt_map_delete(pTHX_ const OP *o) {
+#define lt_map_delete(O) lt_map_delete(aTHX_ (O))
+ XSH_LOCK(<_op_map_mutex);
-#ifdef USE_ITHREADS
- MUTEX_UNLOCK(<_op_map_mutex);
+ ptable_map_delete(lt_op_padxv_map, o);
+#if XSH_HAS_PERL(5, 17, 6)
+ ptable_map_delete(lt_op_padrange_map, o);
#endif
+
+ XSH_UNLOCK(<_op_map_mutex);
}
-/* --- Hooks --------------------------------------------------------------- */
+/* --- Compatibility wrappers ---------------------------------------------- */
-/* ... Our pp_padsv ........................................................ */
+#if XSH_HAS_PERL(5, 10, 0) || defined(PL_parser)
+# ifndef PL_in_my_stash
+# define PL_in_my_stash PL_parser->in_my_stash
+# endif
+#else
+# ifndef PL_in_my_stash
+# define PL_in_my_stash PL_Iin_my_stash
+# endif
+#endif
-STATIC OP *lt_pp_padsv(pTHX) {
- lt_op_info oi;
+#ifndef HvNAME_get
+# define HvNAME_get(H) HvNAME(H)
+#endif
- if ((PL_op->op_private & OPpLVAL_INTRO) && lt_map_fetch(PL_op, &oi)) {
- PADOFFSET targ = PL_op->op_targ;
- SV *sv = PAD_SVl(targ);
+#ifndef HvNAMELEN_get
+# define HvNAMELEN_get(H) strlen(HvNAME_get(H))
+#endif
- if (sv) {
- SV *orig_pkg, *type_pkg, *type_meth;
- int items;
- dSP;
+#ifndef SvREFCNT_inc_simple_void_NN
+# define SvREFCNT_inc_simple_void_NN(S) ((void) SvREFCNT_inc(S))
+#endif
- ENTER;
- SAVETMPS;
+/* --- PP functions -------------------------------------------------------- */
-#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 */
+/* ... pp_padsv ............................................................ */
- 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;
+static OP *lt_pp_padsv(pTHX) {
+ lt_op_padxv_info oi;
- FREETMPS;
- LEAVE;
- }
-
- return CALL_FPTR(oi.old_pp_padsv)(aTHX);
+ if (lt_padxv_map_fetch(PL_op, &oi)) {
+ dTARGET;
+ lt_op_padxv_info_call(&oi, TARG);
+ return oi.old_pp(aTHX);
}
- return CALL_FPTR(PL_ppaddr[OP_PADSV])(aTHX);
+ return PL_op->op_ppaddr(aTHX);
}
-STATIC void lt_pp_padsv_save(pMY_CXT) {
-#define lt_pp_padsv_save() lt_pp_padsv_save(aMY_CXT)
- if (MY_CXT.pp_padsv_saved)
- return;
+/* ... pp_padrange (on perl 5.17.6 and above) .............................. */
- MY_CXT.pp_padsv_saved = PL_ppaddr[OP_PADSV];
- PL_ppaddr[OP_PADSV] = lt_pp_padsv;
-}
+#if XSH_HAS_PERL(5, 17, 6)
+
+static OP *lt_pp_padrange(pTHX) {
+ lt_op_padrange_info roi;
-STATIC void lt_pp_padsv_restore(pMY_CXT_ OP *o) {
-#define lt_pp_padsv_restore(O) lt_pp_padsv_restore(aMY_CXT_ (O))
- OP *(*saved)(pTHX) = MY_CXT.pp_padsv_saved;
+ if (lt_padrange_map_fetch(PL_op, &roi)) {
+ PADOFFSET i, base, count;
+ const OP *p;
- if (!saved)
- return;
+ base = PL_op->op_targ;
+ count = PL_op->op_private & OPpPADRANGE_COUNTMASK;
- if (o->op_ppaddr == lt_pp_padsv)
- o->op_ppaddr = saved;
+ for (i = 0, p = roi.padxv_start; i < count && p; ++i, p = p->op_next) {
+ lt_op_padxv_info oi;
+ while (p->op_type == OP_NULL)
+ p = p->op_next;
+ if (p->op_type == OP_PADSV && lt_padxv_map_fetch(p, &oi))
+ lt_op_padxv_info_call(&oi, PAD_SV(base + i));
+ }
+
+ return roi.old_pp(aTHX);
+ }
- PL_ppaddr[OP_PADSV] = saved;
- MY_CXT.pp_padsv_saved = 0;
+ return PL_op->op_ppaddr(aTHX);
}
-/* ... Our ck_pad{any,sv} .................................................. */
+#endif
+
+/* --- Check functions ----------------------------------------------------- */
-/* 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 pp_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. */
+/* ... ck_pad{any,sv} ...................................................... */
-STATIC OP *(*lt_old_ck_padany)(pTHX_ OP *) = 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 *lt_ck_padany(pTHX_ OP *o) {
+static OP *(*lt_old_ck_padany)(pTHX_ OP *) = 0;
+
+static OP *lt_ck_padany(pTHX_ OP *o) {
HV *stash;
SV *code;
- dMY_CXT;
-
- lt_pp_padsv_restore(o);
- o = CALL_FPTR(lt_old_ck_padany)(aTHX_ o);
+ o = lt_old_ck_padany(aTHX_ o);
stash = PL_in_my_stash;
if (stash && (code = lt_hint())) {
+ dXSH_CXT;
SV *orig_pkg = newSVpvn(HvNAME_get(stash), HvNAMELEN_get(stash));
- SV *orig_meth = MY_CXT.default_meth;
+ SV *orig_meth = XSH_CXT.default_meth; /* Guarded by lt_hint() */
SV *type_pkg = NULL;
SV *type_meth = NULL;
int items;
SPAGAIN;
if (items > 2)
- croak(__PACKAGE__ " mangler should return zero, one or two scalars, but got %d", items);
+ croak(XSH_PACKAGE " mangler should return zero, one or two scalars, but got %d", items);
if (items == 0) {
SvREFCNT_dec(orig_pkg);
FREETMPS;
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_pp_padsv_save();
-
- lt_map_store(o, orig_pkg, type_pkg, type_meth, MY_CXT.pp_padsv_saved);
+ 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) {
- dMY_CXT;
+static OP *lt_ck_padsv(pTHX_ OP *o) {
+ lt_map_delete(o);
- lt_pp_padsv_restore(o);
+ return lt_old_ck_padsv(aTHX_ o);
+}
- lt_map_delete(o);
+/* --- Our peephole optimizer ---------------------------------------------- */
+
+#if XSH_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. */
+ XSH_LOCK(<_op_map_mutex);
+ if (ptable_fetch(lt_op_padxv_map, p)) {
+ XSH_UNLOCK(<_op_map_mutex);
+ lt_padrange_map_store(o, start, o->op_ppaddr);
+ o->op_ppaddr = lt_pp_padrange;
+ } else {
+ XSH_UNLOCK(<_op_map_mutex);
+ }
+ return 1;
+ }
+ }
- return CALL_FPTR(lt_old_ck_padsv)(aTHX_ o);
+ return 0;
}
-STATIC U32 lt_initialized = 0;
+#endif
-STATIC void lt_teardown(pTHX_ void *root) {
- dMY_CXT;
+static void xsh_peep_rec(pTHX_ OP *o, ptable *seen) {
+ for (; o; o = o->op_next) {
+ if (xsh_peep_seen(o, seen))
+ break;
+
+ switch (o->op_type) {
+ case OP_PADSV:
+ if (o->op_ppaddr != lt_pp_padsv && o->op_private & OPpLVAL_INTRO) {
+ lt_op_padxv_info *oi;
+ XSH_LOCK(<_op_map_mutex);
+ oi = ptable_fetch(lt_op_padxv_map, o);
+ if (oi) {
+ oi->old_pp = o->op_ppaddr;
+ o->op_ppaddr = lt_pp_padsv;
+ }
+ XSH_UNLOCK(<_op_map_mutex);
+ }
+ break;
+#if XSH_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
+ default:
+ xsh_peep_maybe_recurse(o, seen);
+ break;
+ }
+ }
+}
- if (!lt_initialized)
- return;
+/* --- Module setup/teardown ----------------------------------------------- */
-#if LT_MULTIPLICITY
- if (aTHX != root)
- return;
+static void xsh_user_global_setup(pTHX) {
+ lt_op_padxv_map = ptable_new(32);
+#if XSH_HAS_PERL(5, 17, 6)
+ lt_op_padrange_map = ptable_new(32);
#endif
-#if LT_THREADSAFE
- ptable_hints_free(MY_CXT.tbl);
+#ifdef USE_ITHREADS
+ MUTEX_INIT(<_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;
+ xsh_ck_replace(OP_PADANY, lt_ck_padany, <_old_ck_padany);
+ xsh_ck_replace(OP_PADSV, lt_ck_padsv, <_old_ck_padsv);
- lt_initialized = 0;
+ return;
}
-STATIC void lt_setup(pTHX) {
-#define lt_setup() lt_setup(aTHX)
- if (lt_initialized)
- return;
-
- {
- MY_CXT_INIT;
-#if LT_THREADSAFE
- MY_CXT.tbl = ptable_new();
- MY_CXT.owner = aTHX;
-#endif
- MY_CXT.pp_padsv_saved = 0;
- MY_CXT.default_meth = newSVpvn("TYPEDSCALAR", 11);
- SvREADONLY_on(MY_CXT.default_meth);
- }
+static void xsh_user_local_setup(pTHX_ xsh_user_cxt_t *cxt) {
+ HV *stash;
- 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);
+ stash = gv_stashpvn(XSH_PACKAGE, XSH_PACKAGE_LEN, 1);
+ newCONSTSUB(stash, "LT_THREADSAFE", newSVuv(XSH_THREADSAFE));
+ newCONSTSUB(stash, "LT_FORKSAFE", newSVuv(XSH_FORKSAFE));
-#if LT_MULTIPLICITY
- call_atexit(lt_teardown, aTHX);
-#else
- call_atexit(lt_teardown, NULL);
-#endif
+ cxt->default_meth = newSVpvn("TYPEDSCALAR", 11);
+ SvREADONLY_on(cxt->default_meth);
- lt_initialized = 1;
+ return;
}
-STATIC U32 lt_booted = 0;
+static void xsh_user_local_teardown(pTHX_ xsh_user_cxt_t *cxt) {
+ SvREFCNT_dec(cxt->default_meth);
+ cxt->default_meth = NULL;
-/* --- XS ------------------------------------------------------------------ */
+ return;
+}
-MODULE = Lexical::Types PACKAGE = Lexical::Types
+static void xsh_user_global_teardown(pTHX) {
+ xsh_ck_restore(OP_PADANY, <_old_ck_padany);
+ xsh_ck_restore(OP_PADSV, <_old_ck_padsv);
-PROTOTYPES: ENABLE
+ ptable_map_free(lt_op_padxv_map);
+ lt_op_padxv_map = NULL;
-BOOT:
-{
- if (!lt_booted++) {
- HV *stash;
+#if XSH_HAS_PERL(5, 17, 6)
+ ptable_map_free(lt_op_padrange_map);
+ lt_op_padrange_map = NULL;
+#endif
- lt_op_map = ptable_new();
#ifdef USE_ITHREADS
- MUTEX_INIT(<_op_map_mutex);
+ MUTEX_DESTROY(<_op_map_mutex);
#endif
- PERL_HASH(lt_hash, __PACKAGE__, __PACKAGE_LEN__);
+ return;
+}
- stash = gv_stashpvn(__PACKAGE__, __PACKAGE_LEN__, 1);
- newCONSTSUB(stash, "LT_THREADSAFE", newSVuv(LT_THREADSAFE));
- }
+/* --- XS ------------------------------------------------------------------ */
+
+MODULE = Lexical::Types PACKAGE = Lexical::Types
+
+PROTOTYPES: ENABLE
- lt_setup();
+BOOT:
+{
+ xsh_setup();
}
-#if LT_THREADSAFE
+#if XSH_THREADSAFE
void
CLONE(...)
PROTOTYPE: DISABLE
-PREINIT:
- ptable *t;
- SV *cloned_default_meth;
PPCODE:
- {
- my_cxt_t ud;
- dMY_CXT;
- ud.tbl = t = ptable_new();
- ud.owner = MY_CXT.owner;
- ptable_walk(MY_CXT.tbl, lt_ptable_hints_clone, &ud);
- cloned_default_meth = lt_clone(MY_CXT.default_meth, MY_CXT.owner);
- }
- {
- MY_CXT_CLONE;
- MY_CXT.tbl = t;
- MY_CXT.owner = aTHX;
- MY_CXT.pp_padsv_saved = 0;
- MY_CXT.default_meth = cloned_default_meth;
- }
- reap(3, lt_thread_cleanup, NULL);
+ xsh_clone();
XSRETURN(0);
#endif
SV *
-_tag(SV *value)
+_tag(SV *code)
PROTOTYPE: $
CODE:
- RETVAL = lt_tag(value);
+ if (!SvOK(code))
+ code = NULL;
+ else if (SvROK(code))
+ code = SvRV(code);
+ RETVAL = xsh_hints_tag(code);
OUTPUT:
RETVAL
projects / perl / modules / Lexical-Types.git / blobdiff