Identify the require scope by the outmost cv outside of the current one

diff --git a/indirect.xs b/indirect.xs
index 83f778f50805435f46557ad8771592b51737426f..a5d5b30afa5716b944f7db0376e03526fa8e0397 100644 (file)
--- a/indirect.xs
+++ b/indirect.xs
@@ -156,7 +156,7 @@
 
 typedef struct {
  SV *code;
- IV  cxreq;
+ IV  require_tag;
 } indirect_hint_t;
 
 #define I_HINT_STRUCT 1
@@ -270,11 +270,12 @@ STATIC void indirect_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
 
 #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 */
@@ -310,20 +311,46 @@ STATIC void indirect_thread_cleanup(pTHX_ void *ud) {
 #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 */
 
@@ -343,9 +370,9 @@ STATIC SV *indirect_tag(pTHX_ SV *value) {
 
 #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;
@@ -375,7 +402,7 @@ STATIC SV *indirect_detag(pTHX_ const SV *hint) {
 #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 */