# define HvNAMELEN_get(H) strlen(HvNAME_get(H))
#endif
-#ifndef ENTER_with_name
-# define ENTER_with_name(N) ENTER
-#endif
+#define I_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
-#ifndef LEAVE_with_name
-# define LEAVE_with_name(N) LEAVE
+#undef ENTERn
+#if defined(ENTER_with_name) && !I_HAS_PERL(5, 11, 4)
+# define ENTERn(N) ENTER_with_name(N)
+#else
+# define ENTERn(N) ENTER
#endif
-#define I_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
+#undef LEAVEn
+#if defined(LEAVE_with_name) && !I_HAS_PERL(5, 11, 4)
+# define LEAVEn(N) LEAVE_with_name(N)
+#else
+# define LEAVEn(N) LEAVE
+#endif
#if I_HAS_PERL(5, 10, 0) || defined(PL_parser)
# ifndef PL_lex_inwhat
typedef struct {
SV *code;
- IV cxreq;
+ IV require_tag;
} indirect_hint_t;
#define I_HINT_STRUCT 1
#if I_HINT_STRUCT
- h2 = PerlMemShared_malloc(sizeof *h2);
- h2->code = indirect_clone(h1->code, ud->owner);
+ h2 = PerlMemShared_malloc(sizeof *h2);
+ h2->code = indirect_clone(h1->code, ud->owner);
SvREFCNT_inc(h2->code);
#if I_WORKAROUND_REQUIRE_PROPAGATION
- h2->cxreq = h1->cxreq;
+ h2->require_tag = PTR2IV(indirect_clone(INT2PTR(SV *, h1->require_tag),
+ ud->owner));
#endif
#else /* I_HINT_STRUCT */
#if I_WORKAROUND_REQUIRE_PROPAGATION
STATIC IV indirect_require_tag(pTHX) {
#define indirect_require_tag() indirect_require_tag(aTHX)
- 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;
-
- if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_op_type == OP_REQUIRE)
- return PTR2IV(cx);
+ 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;
}
- return PTR2IV(NULL);
+get_enclosing_cv:
+ for (outside = CvOUTSIDE(cv); outside; outside = CvOUTSIDE(cv))
+ cv = outside;
+
+ return PTR2IV(cv);
}
#endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
#if I_HINT_STRUCT
h = PerlMemShared_malloc(sizeof *h);
- h->code = code;
+ h->code = code;
# if I_WORKAROUND_REQUIRE_PROPAGATION
- h->cxreq = indirect_require_tag();
+ h->require_tag = indirect_require_tag();
# endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
#else /* I_HINT_STRUCT */
h = code;
#endif /* I_THREADSAFE */
#if I_WORKAROUND_REQUIRE_PROPAGATION
- if (indirect_require_tag() != h->cxreq)
+ if (indirect_require_tag() != h->require_tag)
return NULL;
#endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
STATIC const indirect_op_info_t *indirect_map_fetch(pTHX_ const OP *o) {
#define indirect_map_fetch(O) indirect_map_fetch(aTHX_ (O))
- const indirect_op_info_t *val;
dMY_CXT;
if (MY_CXT.linestr != SvPVX_const(PL_linestr))
if (indirect_initialized)
return;
- MY_CXT_INIT;
+ {
+ MY_CXT_INIT;
#if I_THREADSAFE
- MY_CXT.tbl = ptable_new();
- MY_CXT.owner = aTHX;
+ MY_CXT.tbl = ptable_new();
+ MY_CXT.owner = aTHX;
#endif
- MY_CXT.map = ptable_new();
- MY_CXT.linestr = NULL;
+ MY_CXT.map = ptable_new();
+ MY_CXT.linestr = NULL;
+ }
indirect_old_ck_const = PL_check[OP_CONST];
PL_check[OP_CONST] = MEMBER_TO_FPTR(indirect_ck_const);
PREINIT:
ptable *t;
int *level;
-CODE:
+PPCODE:
{
my_cxt_t ud;
dMY_CXT;
{
level = PerlMemShared_malloc(sizeof *level);
*level = 1;
- LEAVE_with_name("sub");
+ LEAVEn("sub");
SAVEDESTRUCTOR_X(indirect_thread_cleanup, level);
- ENTER_with_name("sub");
+ ENTERn("sub");
}
+ XSRETURN(0);
#endif