X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Types.xs;h=8ff68ada6755bbcc54d77beb2ffc613cbd84f68d;hb=e0828f7e87013a889e46eaaa7c896a34e35b941e;hp=38652141345a6d762c1f27d432b39824ddd8fc6a;hpb=333c198120153b0cfe076fcb54e100dcf0eb9fb4;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/Types.xs b/Types.xs
index 3865214..8ff68ad 100644
--- a/Types.xs
+++ b/Types.xs
@@ -39,6 +39,14 @@
 # define SvREFCNT_inc_simple_NN SvREFCNT_inc
 #endif
 
+#ifndef ENTER_with_name
+# define ENTER_with_name(N) ENTER
+#endif
+
+#ifndef LEAVE_with_name
+# define LEAVE_with_name(N) LEAVE
+#endif
+
 /* ... Thread safety and multiplicity ...................................... */
 
 #ifndef LT_MULTIPLICITY
@@ -91,7 +99,7 @@
 
 typedef struct {
  SV *code;
- UV  requires;
+ IV  cxreq;
 } lt_hint_t;
 
 #define LT_HINT_STRUCT 1
@@ -185,11 +193,11 @@ STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) {
 
 #if LT_HINT_STRUCT
 
- h2           = PerlMemShared_malloc(sizeof *h2);
- h2->code     = lt_clone(h1->code, ud->owner);
+ h2        = PerlMemShared_malloc(sizeof *h2);
+ h2->code  = lt_clone(h1->code, ud->owner);
  SvREFCNT_inc(h2->code);
 #if LT_WORKAROUND_REQUIRE_PROPAGATION
- h2->requires = h1->requires;
+ h2->cxreq = h1->cxreq;
 #endif
 
 #else /*   LT_HINT_STRUCT */
@@ -223,6 +231,26 @@ STATIC void lt_thread_cleanup(pTHX_ void *ud) {
 
 /* ... Hint tags ........................................................... */
 
+#if LT_WORKAROUND_REQUIRE_PROPAGATION
+STATIC IV lt_require_tag(pTHX) {
+#define lt_require_tag() lt_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 /* LT_WORKAROUND_REQUIRE_PROPAGATION */
+
 STATIC SV *lt_tag(pTHX_ SV *value) {
 #define lt_tag(V) lt_tag(aTHX_ (V))
  lt_hint_t *h;
@@ -239,28 +267,10 @@ STATIC SV *lt_tag(pTHX_ SV *value) {
 
 #if LT_HINT_STRUCT
  h = PerlMemShared_malloc(sizeof *h);
- h->code = code;
-
-#if LT_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 /* LT_WORKAROUND_REQUIRE_PROPAGATION */
-
+ h->code  = code;
+# if LT_WORKAROUND_REQUIRE_PROPAGATION
+ h->cxreq = lt_require_tag();
+# endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
 #else  /*  LT_HINT_STRUCT */
  h = code;
 #endif /* !LT_HINT_STRUCT */
@@ -287,24 +297,9 @@ STATIC SV *lt_detag(pTHX_ const SV *hint) {
 #if LT_THREADSAFE
  h = ptable_fetch(MY_CXT.tbl, h);
 #endif /* LT_THREADSAFE */
-
 #if LT_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 (lt_require_tag() != h->cxreq)
+  return NULL;
 #endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
 
  return LT_HINT_CODE(h);
@@ -592,6 +587,8 @@ STATIC OP *lt_ck_padany(pTHX_ OP *o) {
    croak(__PACKAGE__ " mangler should return zero, one or two scalars, but got %d", items);
   if (items == 0) {
    SvREFCNT_dec(orig_pkg);
+   FREETMPS;
+   LEAVE;
    goto skip;
   } else {
    SV *rsv;
@@ -755,9 +752,9 @@ CODE:
  {
   level = PerlMemShared_malloc(sizeof *level);
   *level = 1;
-  LEAVE;
+  LEAVE_with_name("sub");
   SAVEDESTRUCTOR_X(lt_thread_cleanup, level);
-  ENTER;
+  ENTER_with_name("sub");
  }
 
 #endif