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

diff --git a/Plugin.xs b/Plugin.xs
index 04557561946bfad91e7bce3bef0cd3bbd72849a9..d89d32d012e254b5fe5d7081efa60e039488b5ba 100644 (file)
--- a/Plugin.xs
+++ b/Plugin.xs
@@ -61,7 +61,7 @@ typedef struct {
  SV *comp;
  SV *exec;
 #if REP_WORKAROUND_REQUIRE_PROPAGATION
- IV  cxreq;
+ IV  require_tag;
 #endif
 } rep_hint_t;
 
@@ -124,13 +124,13 @@ STATIC void rep_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
  if (ud->owner == aTHX)
   return;
 
- h2        = PerlMemShared_malloc(sizeof *h2);
- h2->comp  = rep_clone(h1->comp, ud->owner);
+ h2              = PerlMemShared_malloc(sizeof *h2);
+ h2->comp        = rep_clone(h1->comp, ud->owner);
  SvREFCNT_inc_simple_void(h2->comp);
- h2->exec  = rep_clone(h1->exec, ud->owner);
+ h2->exec        = rep_clone(h1->exec, ud->owner);
  SvREFCNT_inc_simple_void(h2->exec);
 #if REP_WORKAROUND_REQUIRE_PROPAGATION
- h2->cxreq = h1->cxreq;
+ h2->require_tag = PTR2IV(rep_clone(INT2PTR(SV *, h1->require_tag), ud->owner));
 #endif
 
  ptable_store(ud->tbl, ent->key, h2);
@@ -160,20 +160,46 @@ STATIC SV *rep_validate_callback(SV *code) {
 #if REP_WORKAROUND_REQUIRE_PROPAGATION
 STATIC IV rep_require_tag(pTHX) {
 #define rep_require_tag() rep_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 /* REP_WORKAROUND_REQUIRE_PROPAGATION */
 
@@ -182,11 +208,11 @@ STATIC SV *rep_tag(pTHX_ SV *comp, SV *exec) {
  rep_hint_t *h;
  dMY_CXT;
 
- h = PerlMemShared_malloc(sizeof *h);
- h->comp  = rep_validate_callback(comp);
- h->exec  = rep_validate_callback(exec);
+ h              = PerlMemShared_malloc(sizeof *h);
+ h->comp        = rep_validate_callback(comp);
+ h->exec        = rep_validate_callback(exec);
 #if REP_WORKAROUND_REQUIRE_PROPAGATION
- h->cxreq = rep_require_tag();
+ h->require_tag = rep_require_tag();
 #endif /* REP_WORKAROUND_REQUIRE_PROPAGATION */
 
 #if REP_THREADSAFE
@@ -213,7 +239,7 @@ STATIC const rep_hint_t *rep_detag(pTHX_ const SV *hint) {
 #endif /* REP_THREADSAFE */
 
 #if REP_WORKAROUND_REQUIRE_PROPAGATION
- if (rep_require_tag() != h->cxreq)
+ if (rep_require_tag() != h->require_tag)
   return NULL;
 #endif /* REP_WORKAROUND_REQUIRE_PROPAGATION */