X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FLexical-Types.git;a=blobdiff_plain;f=Types.xs;h=9c02bd8a434caf16346b08e3edfb0dfa6c6cc064;hp=0644b00fadc02cac5f2a7d62433fff146310bd9e;hb=c5d3b9e2115202f79337d1fcfe44ae673c2d9251;hpb=b56734d8bae611bf89f0c65a084de7079d119d96 diff --git a/Types.xs b/Types.xs index 0644b00..9c02bd8 100644 --- a/Types.xs +++ b/Types.xs @@ -23,6 +23,14 @@ # endif #endif +#ifndef LT_WORKAROUND_REQUIRE_PROPAGATION +# define LT_WORKAROUND_REQUIRE_PROPAGATION !LT_HAS_PERL(5, 10, 1) +#endif + +#ifndef LT_HAS_RPEEP +# define LT_HAS_RPEEP LT_HAS_PERL(5, 13, 5) +#endif + #ifndef HvNAME_get # define HvNAME_get(H) HvNAME(H) #endif @@ -31,12 +39,17 @@ # define HvNAMELEN_get(H) strlen(HvNAME_get(H)) #endif -#ifndef SvIS_FREED -# define SvIS_FREED(sv) ((sv)->sv_flags == SVTYPEMASK) +#ifndef SvREFCNT_inc_simple_void_NN +# define SvREFCNT_inc_simple_void_NN(S) ((void) SvREFCNT_inc(S)) #endif /* ... Thread safety and multiplicity ...................................... */ +/* Safe unless stated otherwise in Makefile.PL */ +#ifndef LT_FORKSAFE +# define LT_FORKSAFE 1 +#endif + #ifndef LT_MULTIPLICITY # if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT) # define LT_MULTIPLICITY 1 @@ -44,7 +57,8 @@ # define LT_MULTIPLICITY 0 # endif #endif -#if LT_MULTIPLICITY && !defined(tTHX) + +#ifndef tTHX # define tTHX PerlInterpreter* #endif @@ -59,16 +73,63 @@ # 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 */ + +typedef SV lt_hint_t; + +#define LT_HINT_STRUCT 0 + +#define LT_HINT_CODE(H) (H) + +#define LT_HINT_FREE(H) SvREFCNT_dec(H); + +#endif /* !LT_WORKAROUND_REQUIRE_PROPAGATION */ + #if LT_THREADSAFE #define PTABLE_NAME ptable_hints -#define PTABLE_VAL_FREE(V) if ((V) && !SvIS_FREED((SV *) (V))) SvREFCNT_dec(V) +#define PTABLE_VAL_FREE(V) LT_HINT_FREE(V) #define pPTBL pTHX #define pPTBL_ pTHX_ @@ -77,172 +138,329 @@ #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 */ + +/* ... "Seen" pointer table ................................................ */ + +#define PTABLE_NAME ptable_seen +#define PTABLE_VAL_FREE(V) NOOP + +#include "ptable.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)) + +/* ... Global data ......................................................... */ + #define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION typedef struct { - ptable *tbl; +#if LT_THREADSAFE + ptable *tbl; /* It really is a ptable_hints */ tTHX owner; +#endif + ptable *seen; /* It really is a ptable_seen */ + SV *default_meth; } my_cxt_t; START_MY_CXT -STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) { - my_cxt_t *ud = ud_; - SV *val = ent->val; - - if (ud->owner != aTHX) { - CLONE_PARAMS param; - AV *stashes = (SvTYPE(val) == SVt_PVHV && HvNAME_get(val)) ? newAV() : NULL; - param.stashes = stashes; - param.flags = 0; - param.proto_perl = ud->owner; - val = sv_dup(val, ¶m); - if (stashes) { - av_undef(stashes); - SvREFCNT_dec(stashes); - } - } +/* ... Cloning global data ................................................. */ + +#if LT_THREADSAFE + +typedef struct { + ptable *tbl; +#if LT_HAS_PERL(5, 13, 2) + CLONE_PARAMS *params; +#else + CLONE_PARAMS params; +#endif +} lt_ptable_clone_ud; + +#if LT_HAS_PERL(5, 13, 2) +# define lt_ptable_clone_ud_init(U, T, O) \ + (U).tbl = (T); \ + (U).params = Perl_clone_params_new((O), aTHX) +# define lt_ptable_clone_ud_deinit(U) Perl_clone_params_del((U).params) +# define lt_dup_inc(S, U) SvREFCNT_inc(sv_dup((S), (U)->params)) +#else +# define lt_ptable_clone_ud_init(U, T, O) \ + (U).tbl = (T); \ + (U).params.stashes = newAV(); \ + (U).params.flags = 0; \ + (U).params.proto_perl = (O) +# define lt_ptable_clone_ud_deinit(U) SvREFCNT_dec((U).params.stashes) +# 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_) { + lt_ptable_clone_ud *ud = ud_; + lt_hint_t *h1 = ent->val; + lt_hint_t *h2; + +#if LT_HINT_STRUCT + + h2 = PerlMemShared_malloc(sizeof *h2); + h2->code = lt_dup_inc(h1->code, ud); +#if LT_WORKAROUND_REQUIRE_PROPAGATION + h2->require_tag = PTR2IV(lt_dup_inc(INT2PTR(SV *, h1->require_tag), ud)); +#endif + +#else /* LT_HINT_STRUCT */ + + h2 = lt_dup_inc(h1, ud); - ptable_hints_store(aPTBL_ ud->tbl, ent->key, val); - SvREFCNT_inc(val); +#endif /* !LT_HINT_STRUCT */ + + ptable_hints_store(ud->tbl, ent->key, h2); } -STATIC void lt_thread_cleanup(pTHX_ void *); +#include "reap.h" STATIC void lt_thread_cleanup(pTHX_ void *ud) { - int *level = ud; - SV *id; + dMY_CXT; - if (*level) { - *level = 0; - LEAVE; - SAVEDESTRUCTOR_X(lt_thread_cleanup, level); - ENTER; - } else { - dMY_CXT; - PerlMemShared_free(level); - ptable_hints_free(aPTBL_ MY_CXT.tbl); - } + ptable_hints_free(MY_CXT.tbl); + ptable_seen_free(MY_CXT.seen); } -STATIC SV *lt_tag(pPTBL_ SV *value) { -#define lt_tag(V) lt_tag(aPTBL_ (V)) - dMY_CXT; +#endif /* LT_THREADSAFE */ - value = SvOK(value) && SvROK(value) ? SvRV(value) : NULL; - /* 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 value pointer as the key itself. */ - ptable_hints_store(aPTBL_ MY_CXT.tbl, value, value); - SvREFCNT_inc(value); +/* ... Hint tags ........................................................... */ - return newSVuv(PTR2UV(value)); -} +#if LT_WORKAROUND_REQUIRE_PROPAGATION -STATIC SV *lt_detag(pTHX_ const SV *hint) { -#define lt_detag(H) lt_detag(aTHX_ (H)) - void *tag; - SV *value; +STATIC IV lt_require_tag(pTHX) { +#define lt_require_tag() lt_require_tag(aTHX) + const CV *cv, *outside; - if (!hint || !SvOK(hint) || !SvIOK(hint)) - croak("Wrong hint"); + cv = PL_compcv; - tag = INT2PTR(void *, SvIVX(hint)); - { - dMY_CXT; - value = ptable_fetch(MY_CXT.tbl, tag); + 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; } - return value; +get_enclosing_cv: + for (outside = CvOUTSIDE(cv); outside; outside = CvOUTSIDE(cv)) + cv = outside; + + return PTR2IV(cv); } -#else +#endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */ STATIC SV *lt_tag(pTHX_ SV *value) { #define lt_tag(V) lt_tag(aTHX_ (V)) - UV tag = 0; + lt_hint_t *h; + SV *code = NULL; - if (SvOK(value) && SvROK(value)) { + if (SvROK(value)) { value = SvRV(value); - SvREFCNT_inc(value); - tag = PTR2UV(value); + if (SvTYPE(value) >= SVt_PVCV) { + code = value; + SvREFCNT_inc_simple_void_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 + { + 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); } +#endif /* LT_THREADSAFE */ - return newSVuv(tag); + return newSViv(PTR2IV(h)); } -#define lt_detag(H) INT2PTR(SV *, SvUVX(H)) +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 (!(hint && SvIOK(hint))) + return NULL; + 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 */ + + return LT_HINT_CODE(h); +} STATIC U32 lt_hash = 0; STATIC SV *lt_hint(pTHX) { #define lt_hint() lt_hint(aTHX) - SV *id; -#if LT_HAS_PERL(5, 10, 0) - id = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash, - NULL, - __PACKAGE__, __PACKAGE_LEN__, - 0, - lt_hash); + SV *hint; +#ifdef cop_hints_fetch_pvn + hint = cop_hints_fetch_pvn(PL_curcop, __PACKAGE__, __PACKAGE_LEN__, lt_hash,0); +#elif 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); + SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, 0); if (!val) return 0; - id = *val; + hint = *val; #endif - return (id && SvOK(id)) ? id : NULL; + return lt_detag(hint); } /* ... op => info map ...................................................... */ +#define PTABLE_NAME ptable_map #define PTABLE_VAL_FREE(V) PerlMemShared_free(V) #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)) + STATIC ptable *lt_op_map = NULL; #ifdef USE_ITHREADS + STATIC perl_mutex lt_op_map_mutex; -#endif + +#define LT_LOCK(M) MUTEX_LOCK(M) +#define LT_UNLOCK(M) MUTEX_UNLOCK(M) + +#else /* USE_ITHREADS */ + +#define LT_LOCK(M) +#define LT_UNLOCK(M) + +#endif /* !USE_ITHREADS */ typedef struct { +#ifdef MULTIPLICITY + STRLEN buf_size, orig_pkg_len, type_pkg_len, type_meth_len; + char *buf; +#else /* MULTIPLICITY */ SV *orig_pkg; SV *type_pkg; SV *type_meth; - OP *(*pp_padsv)(pTHX); +#endif /* !MULTIPLICITY */ + OP *(*old_pp_padsv)(pTHX); } lt_op_info; -STATIC void lt_map_store(pPTBL_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) { -#define lt_map_store(O, OP, TP, TM, PP) lt_map_store(aPTBL_ (O), (OP), (TP), (TM), (PP)) +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; -#ifdef USE_ITHREADS - MUTEX_LOCK(<_op_map_mutex); -#endif + LT_LOCK(<_op_map_mutex); if (!(oi = ptable_fetch(lt_op_map, o))) { oi = PerlMemShared_malloc(sizeof *oi); - ptable_store(aPTBL_ lt_op_map, o, oi); + ptable_map_store(lt_op_map, o, oi); +#ifdef MULTIPLICITY + oi->buf = NULL; + oi->buf_size = 0; +#else /* MULTIPLICITY */ + } else { + SvREFCNT_dec(oi->orig_pkg); + SvREFCNT_dec(oi->type_pkg); + SvREFCNT_dec(oi->type_meth); +#endif /* !MULTIPLICITY */ } +#ifdef MULTIPLICITY + { + STRLEN op_len = SvCUR(orig_pkg); + STRLEN tp_len = SvCUR(type_pkg); + STRLEN tm_len = SvCUR(type_meth); + 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); + oi->buf_size = new_buf_size; + } + buf = oi->buf; + Copy(SvPVX(orig_pkg), buf, op_len, char); + buf += op_len; + Copy(SvPVX(type_pkg), buf, tp_len, char); + buf += tp_len; + Copy(SvPVX(type_meth), buf, tm_len, char); + oi->orig_pkg_len = op_len; + oi->type_pkg_len = tp_len; + oi->type_meth_len = tm_len; + SvREFCNT_dec(orig_pkg); + SvREFCNT_dec(type_pkg); + SvREFCNT_dec(type_meth); + } +#else /* MULTIPLICITY */ oi->orig_pkg = orig_pkg; oi->type_pkg = type_pkg; oi->type_meth = type_meth; - oi->pp_padsv = pp_padsv; +#endif /* !MULTIPLICITY */ -#ifdef USE_ITHREADS - MUTEX_UNLOCK(<_op_map_mutex); -#endif + oi->old_pp_padsv = old_pp_padsv; + + 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; -#ifdef USE_ITHREADS - MUTEX_LOCK(<_op_map_mutex); -#endif + LT_LOCK(<_op_map_mutex); val = ptable_fetch(lt_op_map, o); if (val) { @@ -250,13 +468,20 @@ STATIC const lt_op_info *lt_map_fetch(const OP *o, lt_op_info *oi) { val = oi; } -#ifdef USE_ITHREADS - MUTEX_UNLOCK(<_op_map_mutex); -#endif + LT_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)) + LT_LOCK(<_op_map_mutex); + + ptable_map_delete(lt_op_map, o); + + LT_UNLOCK(<_op_map_mutex); +} + /* --- Hooks --------------------------------------------------------------- */ /* ... Our pp_padsv ........................................................ */ @@ -264,206 +489,336 @@ STATIC const lt_op_info *lt_map_fetch(const OP *o, lt_op_info *oi) { STATIC OP *lt_pp_padsv(pTHX) { lt_op_info oi; - if ((PL_op->op_private & OPpLVAL_INTRO) && lt_map_fetch(PL_op, &oi)) { - PADOFFSET targ = PL_op->op_targ; - SV *sv = PAD_SVl(targ); - - if (sv) { - int items; - dSP; - - ENTER; - SAVETMPS; - - PUSHMARK(SP); - EXTEND(SP, 3); - PUSHs(oi.type_pkg); - PUSHs(sv); - PUSHs(oi.orig_pkg); - PUTBACK; - - items = call_sv(oi.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; + if (lt_map_fetch(PL_op, &oi)) { + SV *orig_pkg, *type_pkg, *type_meth; + int items; + dSP; + dTARGET; - FREETMPS; - LEAVE; + 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); + PUSHTARG; + PUSHs(orig_pkg); + PUTBACK; + + items = call_sv(type_meth, G_ARRAY | G_METHOD); + + 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; - return CALL_FPTR(oi.pp_padsv)(aTHX); - } - - return CALL_FPTR(PL_ppaddr[OP_PADSV])(aTHX); -} - -STATIC OP *(*lt_pp_padsv_saved)(pTHX) = 0; - -STATIC void lt_pp_padsv_save(void) { - if (lt_pp_padsv_saved) - return; - - lt_pp_padsv_saved = PL_ppaddr[OP_PADSV]; - PL_ppaddr[OP_PADSV] = lt_pp_padsv; -} - -STATIC void lt_pp_padsv_restore(OP *o) { - if (!lt_pp_padsv_saved) - return; + FREETMPS; + LEAVE; - if (o->op_ppaddr == lt_pp_padsv) - o->op_ppaddr = lt_pp_padsv_saved; + return oi.old_pp_padsv(aTHX); + } - PL_ppaddr[OP_PADSV] = lt_pp_padsv_saved; - lt_pp_padsv_saved = 0; + return PL_op->op_ppaddr(aTHX); } /* ... Our 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 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. */ - -STATIC SV *lt_default_meth = NULL; +/* 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_old_ck_padany)(pTHX_ OP *) = 0; STATIC OP *lt_ck_padany(pTHX_ OP *o) { HV *stash; - SV *hint; - - lt_pp_padsv_restore(o); + SV *code; - o = CALL_FPTR(lt_old_ck_padany)(aTHX_ o); + o = lt_old_ck_padany(aTHX_ o); stash = PL_in_my_stash; - if (stash && (hint = lt_hint())) { + if (stash && (code = lt_hint())) { + dMY_CXT; SV *orig_pkg = newSVpvn(HvNAME_get(stash), HvNAMELEN_get(stash)); - SV *orig_meth = lt_default_meth; + SV *orig_meth = MY_CXT.default_meth; SV *type_pkg = NULL; SV *type_meth = NULL; - SV *code = lt_detag(hint); + int items; + + dSP; SvREADONLY_on(orig_pkg); - if (code) { - int items; - dSP; - - ENTER; - SAVETMPS; - - PUSHMARK(SP); - EXTEND(SP, 2); - PUSHs(orig_pkg); - PUSHs(orig_meth); - PUTBACK; - - items = call_sv(code, G_ARRAY); - - SPAGAIN; - if (items > 2) - croak(__PACKAGE__ " mangler should return zero, one or two scalars, but got %d", items); - if (items == 0) { - SvREFCNT_dec(orig_pkg); - goto skip; - } else { - SV *rsv; - if (items > 1) { - rsv = POPs; - if (SvOK(rsv)) { - type_meth = newSVsv(rsv); - SvREADONLY_on(type_meth); - } - } + ENTER; + SAVETMPS; + + PUSHMARK(SP); + EXTEND(SP, 2); + PUSHs(orig_pkg); + PUSHs(orig_meth); + PUTBACK; + + items = call_sv(code, G_ARRAY); + + SPAGAIN; + if (items > 2) + croak(__PACKAGE__ " mangler should return zero, one or two scalars, but got %d", items); + if (items == 0) { + SvREFCNT_dec(orig_pkg); + FREETMPS; + LEAVE; + goto skip; + } else { + SV *rsv; + if (items > 1) { rsv = POPs; if (SvOK(rsv)) { - type_pkg = newSVsv(rsv); - SvREADONLY_on(type_pkg); + type_meth = newSVsv(rsv); + SvREADONLY_on(type_meth); } } - PUTBACK; - - FREETMPS; - LEAVE; + rsv = POPs; + if (SvOK(rsv)) { + type_pkg = newSVsv(rsv); + SvREADONLY_on(type_pkg); + } } + PUTBACK; + + FREETMPS; + LEAVE; 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, lt_pp_padsv_saved); + lt_map_store(o, orig_pkg, type_pkg, type_meth, o->op_ppaddr); + } else { +skip: + lt_map_delete(o); } -skip: return o; } STATIC OP *(*lt_old_ck_padsv)(pTHX_ OP *) = 0; STATIC OP *lt_ck_padsv(pTHX_ OP *o) { - lt_pp_padsv_restore(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 */ + +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 (ptable_fetch(seen, o)) + break; + ptable_seen_store(seen, o, o); - return CALL_FPTR(lt_old_ck_padsv)(aTHX_ o); + switch (o->op_type) { + case OP_PADSV: + if (o->op_ppaddr != lt_pp_padsv && o->op_private & OPpLVAL_INTRO) { + LT_LOCK(<_op_map_mutex); + oi = ptable_fetch(lt_op_map, o); + if (oi) { + oi->old_pp_padsv = o->op_ppaddr; + o->op_ppaddr = lt_pp_padsv; + } + LT_UNLOCK(<_op_map_mutex); + } + break; +#if !LT_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 LT_HAS_PERL(5, 10, 0) + case OP_ONCE: + case OP_DOR: + case OP_DORASSIGN: +# endif + lt_peep_rec(cLOGOPo->op_other); + break; + case OP_ENTERLOOP: + case OP_ENTERITER: + lt_peep_rec(cLOOPo->op_redoop); + lt_peep_rec(cLOOPo->op_nextop); + lt_peep_rec(cLOOPo->op_lastop); + break; +# if LT_HAS_PERL(5, 9, 5) + case OP_SUBST: + lt_peep_rec(cPMOPo->op_pmstashstartu.op_pmreplstart); + break; +# else + case OP_QR: + case OP_MATCH: + case OP_SUBST: + lt_peep_rec(cPMOPo->op_pmreplstart); + break; +# endif +#endif /* !LT_HAS_RPEEP */ + default: + break; + } + } } +STATIC void lt_peep(pTHX_ OP *o) { + dMY_CXT; + ptable *seen = MY_CXT.seen; + + lt_old_peep(aTHX_ o); + + ptable_seen_clear(seen); + lt_peep_rec(o); + ptable_seen_clear(seen); +} + +/* --- Interpreter setup/teardown ------------------------------------------ */ + + STATIC U32 lt_initialized = 0; +STATIC void lt_teardown(pTHX_ void *root) { + if (!lt_initialized) + return; + +#if LT_MULTIPLICITY + if (aTHX != root) + return; +#endif + + { + dMY_CXT; +#if LT_THREADSAFE + ptable_hints_free(MY_CXT.tbl); +#endif + ptable_seen_free(MY_CXT.seen); + 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; + +#if LT_HAS_RPEEP + PL_rpeepp = lt_old_peep; +#else + PL_peepp = lt_old_peep; +#endif + lt_old_peep = 0; + + lt_initialized = 0; +} + +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.seen = ptable_new(); + MY_CXT.default_meth = newSVpvn("TYPEDSCALAR", 11); + SvREADONLY_on(MY_CXT.default_meth); + } + + 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); + +#if LT_HAS_RPEEP + lt_old_peep = PL_rpeepp; + PL_rpeepp = lt_peep; +#else + lt_old_peep = PL_peepp; + PL_peepp = lt_peep; +#endif + +#if LT_MULTIPLICITY + call_atexit(lt_teardown, aTHX); +#else + call_atexit(lt_teardown, NULL); +#endif + + lt_initialized = 1; +} + +STATIC U32 lt_booted = 0; + /* --- XS ------------------------------------------------------------------ */ MODULE = Lexical::Types PACKAGE = Lexical::Types PROTOTYPES: ENABLE -BOOT: -{ - if (!lt_initialized++) { +BOOT: +{ + if (!lt_booted++) { HV *stash; -#if LT_THREADSAFE - MY_CXT_INIT; - MY_CXT.tbl = ptable_new(); - MY_CXT.owner = aTHX; -#endif lt_op_map = ptable_new(); #ifdef USE_ITHREADS MUTEX_INIT(<_op_map_mutex); #endif - lt_default_meth = newSVpvn("TYPEDSCALAR", 11); - SvREADONLY_on(lt_default_meth); - PERL_HASH(lt_hash, __PACKAGE__, __PACKAGE_LEN__); - 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(__PACKAGE__, __PACKAGE_LEN__, 1); newCONSTSUB(stash, "LT_THREADSAFE", newSVuv(LT_THREADSAFE)); + newCONSTSUB(stash, "LT_FORKSAFE", newSVuv(LT_FORKSAFE)); } + + lt_setup(); } #if LT_THREADSAFE @@ -473,27 +828,31 @@ CLONE(...) PROTOTYPE: DISABLE PREINIT: ptable *t; - int *level; -CODE: + ptable *s; + 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); + { + lt_ptable_clone_ud ud; + dMY_CXT; + + t = ptable_new(); + lt_ptable_clone_ud_init(ud, t, MY_CXT.owner); + ptable_walk(MY_CXT.tbl, lt_ptable_clone, &ud); + cloned_default_meth = lt_dup_inc(MY_CXT.default_meth, &ud); + lt_ptable_clone_ud_deinit(ud); + } + s = ptable_new(); } { MY_CXT_CLONE; - MY_CXT.tbl = t; - MY_CXT.owner = aTHX; - } - { - level = PerlMemShared_malloc(sizeof *level); - *level = 1; - LEAVE; - SAVEDESTRUCTOR_X(lt_thread_cleanup, level); - ENTER; + MY_CXT.tbl = t; + MY_CXT.owner = aTHX; + MY_CXT.seen = s; + MY_CXT.default_meth = cloned_default_meth; } + reap(3, lt_thread_cleanup, NULL); + XSRETURN(0); #endif