]> git.vpit.fr Git - perl/modules/indirect.git/commitdiff
Only look up to the first require scope for the require propagation workaround rt50570
authorVincent Pit <vince@profvince.com>
Wed, 30 Sep 2009 22:16:49 +0000 (00:16 +0200)
committerVincent Pit <vince@profvince.com>
Wed, 30 Sep 2009 22:45:03 +0000 (00:45 +0200)
indirect.xs

index 67eea50401675cbaa32932dde88970c9b99dc725..df9bca8d979753c50637b079c8b639cab73f51c8 100644 (file)
 #if I_WORKAROUND_REQUIRE_PROPAGATION
 
 typedef struct {
- SV  *code;
- I32  requires;
+ SV *code;
+ IV  cxreq;
 } indirect_hint_t;
 
 #define I_HINT_STRUCT 1
@@ -256,11 +256,11 @@ 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->requires = h1->requires;
+ h2->cxreq = h1->cxreq;
 #endif
 
 #else  /*  I_HINT_STRUCT */
@@ -293,6 +293,26 @@ STATIC void indirect_thread_cleanup(pTHX_ void *ud) {
 
 #endif /* I_THREADSAFE */
 
+#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);
+  }
+ }
+
+ return PTR2IV(NULL);
+}
+#endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
+
 STATIC SV *indirect_tag(pTHX_ SV *value) {
 #define indirect_tag(V) indirect_tag(aTHX_ (V))
  indirect_hint_t *h;
@@ -309,28 +329,10 @@ STATIC SV *indirect_tag(pTHX_ SV *value) {
 
 #if I_HINT_STRUCT
  h = PerlMemShared_malloc(sizeof *h);
- h->code = code;
-
-#if I_WORKAROUND_REQUIRE_PROPAGATION
- {
-  const PERL_SI *si;
-  I32            requires = 0;
-
-  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)
-     ++requires;
-   }
-  }
-
-  h->requires = requires;
- }
-#endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
-
+ h->code  = code;
+# if I_WORKAROUND_REQUIRE_PROPAGATION
+ h->cxreq = indirect_require_tag();
+# endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
 #else  /*  I_HINT_STRUCT */
  h = code;
 #endif /* !I_HINT_STRUCT */
@@ -359,22 +361,8 @@ STATIC SV *indirect_detag(pTHX_ const SV *hint) {
 #endif /* I_THREADSAFE */
 
 #if I_WORKAROUND_REQUIRE_PROPAGATION
- {
-  const PERL_SI *si;
-  I32            requires = 0;
-
-  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
-                               && ++requires > h->requires)
-     return NULL;
-   }
-  }
- }
+ if (indirect_require_tag() != h->cxreq)
+  return NULL;
 #endif /* I_WORKAROUND_REQUIRE_PROPAGATION */
 
  return I_HINT_CODE(h);