# 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)
#endif
#ifndef A_MULTIPLICITY
-# if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
+# 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*
# undef MY_CXT
# define MY_CXT a_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
#else
-STATIC void a_ck_replace(pTHX_ OPCODE type, a_ck_t new_ck, a_ck_t *old_ck_p) {
+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_MUTEX_LOCK;
if (!*old_ck_p) {
#endif
-STATIC void a_ck_restore(pTHX_ OPCODE type, a_ck_t *old_ck_p) {
+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_MUTEX_LOCK;
if (*old_ck_p) {
# 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_) {
+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;
#endif /* A_WORKAROUND_REQUIRE_PROPAGATION */
-STATIC void a_thread_cleanup(pTHX_ void *ud) {
+static void a_thread_cleanup(pTHX_ void *ud) {
dMY_CXT;
#if A_WORKAROUND_REQUIRE_PROPAGATION
MY_CXT.seen = NULL;
}
-STATIC int a_endav_free(pTHX_ SV *sv, MAGIC *mg) {
+static int a_endav_free(pTHX_ SV *sv, MAGIC *mg) {
SAVEDESTRUCTOR_X(a_thread_cleanup, NULL);
return 0;
}
-STATIC MGVTBL a_endav_vtbl = {
+static MGVTBL a_endav_vtbl = {
0,
0,
0,
#if A_WORKAROUND_REQUIRE_PROPAGATION
-STATIC IV a_require_tag(pTHX) {
+static IV a_require_tag(pTHX) {
#define a_require_tag() a_require_tag(aTHX)
const CV *cv, *outside;
return PTR2IV(cv);
}
-STATIC SV *a_tag(pTHX_ UV bits) {
+static SV *a_tag(pTHX_ UV bits) {
#define a_tag(B) a_tag(aTHX_ (B))
a_hint_t *h;
#if A_THREADSAFE
return newSViv(PTR2IV(h));
}
-STATIC UV a_detag(pTHX_ const SV *hint) {
+static UV a_detag(pTHX_ const SV *hint) {
#define a_detag(H) a_detag(aTHX_ (H))
a_hint_t *h;
#if A_THREADSAFE
#define A_HINT_ROOT 64
#define A_HINT_DEREF 128
-STATIC U32 a_hash = 0;
+static U32 a_hash = 0;
-STATIC UV a_hint(pTHX) {
+static UV a_hint(pTHX) {
#define a_hint() a_hint(aTHX)
SV *hint;
#ifdef cop_hints_fetch_pvn
#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 *a_op_map = NULL;
+static ptable *a_op_map = NULL;
#ifdef USE_ITHREADS
#define dA_MAP_THX a_op_info a_op_map_tmp_oi
-STATIC perl_mutex a_op_map_mutex;
+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) {
+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);
#endif /* !USE_ITHREADS */
-STATIC const a_op_info *a_map_store_locked(pPTBLMS_ const OP *o, OP *(*old_pp)(pTHX), void *next, UV flags) {
+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;
return oi;
}
-STATIC void a_map_store(pPTBLMS_ const OP *o, OP *(*old_pp)(pTHX), void *next, UV flags) {
+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);
A_UNLOCK(&a_op_map_mutex);
}
-STATIC void a_map_delete(pTHX_ const OP *o) {
+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);
A_UNLOCK(&a_op_map_mutex);
}
-STATIC const OP *a_map_descend(const OP *o) {
+static const OP *a_map_descend(const OP *o) {
switch (PL_opargs[o->op_type] & OA_CLASS_MASK) {
case OA_BASEOP:
case OA_UNOP:
return NULL;
}
-STATIC void a_map_store_root(pPTBLMS_ const OP *root, OP *(*old_pp)(pTHX), UV flags) {
+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;
return;
}
-STATIC void a_map_update_flags_topdown(const OP *root, UV flags) {
+static void a_map_update_flags_topdown(const OP *root, UV flags) {
a_op_info *oi;
const OP *o = root;
#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) {
+static void a_map_update_flags_bottomup(const OP *o, UV flags, UV rflags) {
a_op_info *oi;
A_LOCK(&a_op_map_mutex);
/* ... Decide whether this expression should be autovivified or not ........ */
-STATIC UV a_map_resolve(const OP *o, const a_op_info *oi) {
+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;
/* ... Inspired from pp_defined() .......................................... */
-STATIC int a_undef(pTHX_ SV *sv) {
+static int a_undef(pTHX_ SV *sv) {
#define a_undef(S) a_undef(aTHX_ (S))
switch (SvTYPE(sv)) {
case SVt_NULL:
/* ... pp_rv2av ............................................................ */
-STATIC OP *a_pp_rv2av(pTHX) {
+static OP *a_pp_rv2av(pTHX) {
dA_MAP_THX;
const a_op_info *oi;
dSP;
/* ... pp_rv2hv ............................................................ */
-STATIC OP *a_pp_rv2hv_simple(pTHX) {
+static OP *a_pp_rv2hv_simple(pTHX) {
dA_MAP_THX;
const a_op_info *oi;
dSP;
return oi->old_pp(aTHX);
}
-STATIC OP *a_pp_rv2hv(pTHX) {
+static OP *a_pp_rv2hv(pTHX) {
dA_MAP_THX;
const a_op_info *oi;
dSP;
/* ... pp_deref (aelem,helem,rv2sv,padsv) .................................. */
-STATIC OP *a_pp_deref(pTHX) {
+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) {
dA_MAP_THX;
const a_op_info *oi;
UV flags;
if (flags & (A_HINT_NOTIFY|A_HINT_STORE)) {
SPAGAIN;
- if (a_undef(TOPs)) {
- 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");
- }
+ if (a_undef(TOPs))
+ a_cannot_vivify(flags);
}
return o;
/* ... pp_root (exists,delete,keys,values) ................................. */
-STATIC OP *a_pp_root_unop(pTHX) {
+static OP *a_pp_root_unop(pTHX) {
dSP;
if (a_undef(TOPs)) {
}
}
-STATIC OP *a_pp_root_binop(pTHX) {
+static OP *a_pp_root_binop(pTHX) {
dSP;
if (a_undef(TOPm1s)) {
}
}
+#if A_HAS_MULTIDEREF
+
+/* ... pp_multideref ....................................................... */
+
+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;
+ }
+
+ {
+ 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];
+}
+
+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;
+
+ a_do_fake_pp_unop_init(&unop, type, flags);
+
+ EXTEND(SP, 1);
+ PUSHs(arg);
+ PUTBACK;
+
+ return a_do_fake_pp(&unop);
+}
+
+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);
+
+ EXTEND(SP, 2);
+ PUSHs(arg1);
+ PUSHs(arg2);
+ PUTBACK;
+
+ return a_do_fake_pp(&unop);
+}
+
+#define a_do_pp_rv2av(R) a_do_fake_pp_unop_arg1(OP_RV2AV, OPf_REF, (R))
+#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_aelem(A, I) a_do_fake_pp_unop_arg2(OP_AELEM, 0, (A), (I))
+
+#define a_do_pp_rv2hv(R) a_do_fake_pp_unop_arg1(OP_RV2HV, OPf_REF, (R))
+#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))
+#define a_do_pp_helem(H, K) a_do_fake_pp_unop_arg2(OP_HELEM, 0, (H), (K))
+
+static OP *a_pp_multideref(pTHX) {
+ UNOP_AUX_item *items = cUNOP_AUXx(PL_op)->op_aux;
+ UV actions = items->uv;
+ U8 isexdel = PL_op->op_private & (OPpMULTIDEREF_EXISTS|OPpMULTIDEREF_DELETE);
+ UV flags = 0;
+ SV *sv = NULL;
+ dSP;
+
+ {
+ dA_MAP_THX;
+ const a_op_info *oi = a_map_fetch(PL_op);
+ flags = oi->flags;
+ if (isexdel) {
+ if (isexdel & OPpMULTIDEREF_EXISTS) {
+ if (flags & A_HINT_EXISTS)
+ goto hijack;
+ } else if (flags & A_HINT_DELETE) {
+ assert(isexdel & OPpMULTIDEREF_DELETE);
+ goto hijack;
+ }
+ } else if (flags & A_HINT_FETCH) {
+ goto hijack;
+ }
+ return oi->old_pp(aTHX);
+ }
+
+hijack:
+ 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);
+ if (a_undef(sv))
+ goto ret_undef;
+ /* FALLTHROUGH */
+ case MDEREF_AV_vivify_rv2av_aelem: /* vivify, ->[...] */
+do_AV_vivify_rv2av_aelem:
+ sv = Perl_vivify_ref(aTHX_ sv, OPpDEREF_AV);
+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) {
+ if (isexdel) {
+ if (isexdel & OPpMULTIDEREF_EXISTS)
+ sv = a_do_pp_aexists(sv, esv);
+ else
+ sv = a_do_pp_adelete(sv, esv);
+ } else {
+ sv = a_do_pp_aelem(sv, esv);
+ }
+ goto finish;
+ } else {
+ sv = a_do_pp_aelem(sv, esv);
+ }
+ }
+ 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);
+ if (a_undef(sv))
+ goto ret_undef;
+ /* FALLTHROUGH */
+ case MDEREF_HV_vivify_rv2hv_helem: /* vivify, ->{...} */
+do_HV_vivify_rv2hv_helem:
+ sv = Perl_vivify_ref(aTHX_ sv, OPpDEREF_HV);
+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) {
+ if (isexdel) {
+ if (isexdel & OPpMULTIDEREF_EXISTS)
+ sv = a_do_pp_hexists(sv, key);
+ else
+ sv = a_do_pp_hdelete(sv, key);
+ } else {
+ sv = a_do_pp_helem(sv, key);
+ }
+ goto finish;
+ } else {
+ sv = a_do_pp_helem(sv, key);
+ }
+ }
+ }
+
+ actions >>= MDEREF_SHIFT;
+ }
+
+ret_undef:
+ if (flags & (A_HINT_NOTIFY|A_HINT_STORE))
+ a_cannot_vivify(flags);
+ if (isexdel & OPpMULTIDEREF_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)) {
+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
* 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_old_ck_padany)(pTHX_ OP *) = 0;
-STATIC OP *a_ck_padany(pTHX_ OP *o) {
+static OP *a_ck_padany(pTHX_ OP *o) {
UV hint;
o = a_old_ck_padany(aTHX_ o);
return o;
}
-STATIC OP *(*a_old_ck_padsv)(pTHX_ OP *) = 0;
+static OP *(*a_old_ck_padsv)(pTHX_ OP *) = 0;
-STATIC OP *a_ck_padsv(pTHX_ OP *o) {
+static OP *a_ck_padsv(pTHX_ OP *o) {
UV hint;
o = a_old_ck_padsv(aTHX_ o);
* modifying context, so the expression can't be resolved yet. It will be at the
* first invocation of a_pp_deref() for this 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_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_ck_deref(pTHX_ OP *o) {
+static OP *a_ck_deref(pTHX_ OP *o) {
OP * (*old_ck)(pTHX_ OP *o) = 0;
UV hint = a_hint();
o = old_ck(aTHX_ o);
if (hint & A_HINT_DO) {
+#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)
+ a_map_store(kid, kid->op_ppaddr, NULL, hint);
+ }
+#endif
a_map_store_root(o, o->op_ppaddr, hint);
o->op_ppaddr = a_pp_deref;
} else
* rv2[ah]v, resolution is handled by the first call to a_pp_deref() in the
* expression. */
-STATIC OP *(*a_old_ck_rv2av)(pTHX_ OP *) = 0;
-STATIC OP *(*a_old_ck_rv2hv)(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_rv2xv(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;
* 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_old_ck_aslice)(pTHX_ OP *) = 0;
+static OP *(*a_old_ck_hslice)(pTHX_ OP *) = 0;
-STATIC OP *a_ck_xslice(pTHX_ OP *o) {
+static OP *a_ck_xslice(pTHX_ OP *o) {
OP * (*old_ck)(pTHX_ OP *o) = 0;
UV hint = a_hint();
/* 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_keys) (pTHX_ OP *) = 0;
-STATIC OP *(*a_old_ck_values)(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;
/* ... Our peephole optimizer .............................................. */
-STATIC peep_t a_old_peep = 0; /* This is actually the rpeep past 5.13.5 */
+static peep_t a_old_peep = 0; /* This is actually the rpeep past 5.13.5 */
-STATIC void a_peep_rec(pTHX_ OP *o, ptable *seen);
+static void a_peep_rec(pTHX_ OP *o, ptable *seen);
-STATIC void a_peep_rec(pTHX_ OP *o, ptable *seen) {
+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;
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) {
+ UV isexdel;
+ oi = a_map_fetch(cUNOPo->op_first);
+ if (!oi)
+ break;
+ flags = oi->flags;
+ isexdel = o->op_private & (OPpMULTIDEREF_EXISTS|OPpMULTIDEREF_DELETE);
+ if ( ((flags & A_HINT_FETCH) && !isexdel)
+ || (flags & A_HINT_EXISTS) && (isexdel & OPpMULTIDEREF_EXISTS)
+ || (flags & A_HINT_DELETE) && (isexdel & OPpMULTIDEREF_DELETE)) {
+ a_map_store(o, o->op_ppaddr, oi->next, oi->flags);
+ o->op_ppaddr = a_pp_multideref;
+ }
+ }
+ break;
+#endif
#if !A_HAS_RPEEP
case OP_MAPWHILE:
case OP_GREPWHILE:
}
}
-STATIC void a_peep(pTHX_ OP *o) {
+static void a_peep(pTHX_ OP *o) {
dMY_CXT;
ptable *seen = MY_CXT.seen;
/* --- Interpreter setup/teardown ------------------------------------------ */
-STATIC U32 a_initialized = 0;
+static U32 a_initialized = 0;
-STATIC void a_teardown(pTHX_ void *root) {
+static void a_teardown(pTHX_ void *root) {
if (!a_initialized)
return;
a_initialized = 0;
}
-STATIC void a_setup(pTHX) {
+static void a_setup(pTHX) {
#define a_setup() a_setup(aTHX)
if (a_initialized)
return;
a_initialized = 1;
}
-STATIC U32 a_booted = 0;
+static U32 a_booted = 0;
/* --- XS ------------------------------------------------------------------ */
projects / perl / modules / autovivification.git / blobdiff