X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FLexical-Types.git;a=blobdiff_plain;f=Types.xs;h=375d771176f12c374f8b84b8fd09a94756d17b0b;hp=4883ea19335aca4be9652d20c6d513d728455c30;hb=c530c61ff04bdbd8bc101a3e88273fc4219d963e;hpb=a7eb9184fdf28bcad8e1955399eec5ca3284bac3

diff --git a/Types.xs b/Types.xs
index 4883ea1..375d771 100644
--- a/Types.xs
+++ b/Types.xs
@@ -39,14 +39,6 @@
 # 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
@@ -99,7 +91,7 @@
 
 typedef struct {
  SV *code;
- IV  cxreq;
+ IV  require_tag;
 } lt_hint_t;
 
 #define LT_HINT_STRUCT 1
@@ -193,11 +185,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->cxreq = h1->cxreq;
+ h2->require_tag = PTR2IV(lt_clone(INT2PTR(SV *, h1->require_tag), ud->owner));
 #endif
 
 #else /*   LT_HINT_STRUCT */
@@ -210,21 +202,12 @@ STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) {
  ptable_hints_store(ud->tbl, ent->key, h2);
 }
 
-STATIC void lt_thread_cleanup(pTHX_ void *);
+#include "reap.h"
 
 STATIC void lt_thread_cleanup(pTHX_ void *ud) {
- int *level = ud;
+ dMY_CXT;
 
- if (*level) {
-  *level = 0;
-  LEAVE;
-  SAVEDESTRUCTOR_X(lt_thread_cleanup, level);
-  ENTER;
- } else {
-  dMY_CXT;
-  PerlMemShared_free(level);
-  ptable_hints_free(MY_CXT.tbl);
- }
+ ptable_hints_free(MY_CXT.tbl);
 }
 
 #endif /* LT_THREADSAFE */
@@ -234,20 +217,46 @@ STATIC void lt_thread_cleanup(pTHX_ void *ud) {
 #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);
+ 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 /* LT_WORKAROUND_REQUIRE_PROPAGATION */
 
@@ -267,9 +276,9 @@ STATIC SV *lt_tag(pTHX_ SV *value) {
 
 #if LT_HINT_STRUCT
  h = PerlMemShared_malloc(sizeof *h);
- h->code  = code;
+ h->code        = code;
 # if LT_WORKAROUND_REQUIRE_PROPAGATION
- h->cxreq = lt_require_tag();
+ h->require_tag = lt_require_tag();
 # endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
 #else  /*  LT_HINT_STRUCT */
  h = code;
@@ -298,7 +307,7 @@ STATIC SV *lt_detag(pTHX_ const SV *hint) {
  h = ptable_fetch(MY_CXT.tbl, h);
 #endif /* LT_THREADSAFE */
 #if LT_WORKAROUND_REQUIRE_PROPAGATION
- if (lt_require_tag() != h->cxreq)
+ if (lt_require_tag() != h->require_tag)
   return NULL;
 #endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */
 
@@ -674,14 +683,16 @@ STATIC void lt_setup(pTHX) {
  if (lt_initialized)
   return;
 
- MY_CXT_INIT;
+ {
+  MY_CXT_INIT;
 #if LT_THREADSAFE
- MY_CXT.tbl            = ptable_new();
- MY_CXT.owner          = aTHX;
+  MY_CXT.tbl            = ptable_new();
+  MY_CXT.owner          = aTHX;
 #endif
- MY_CXT.pp_padsv_saved = 0;
- MY_CXT.default_meth   = newSVpvn("TYPEDSCALAR", 11);
- SvREADONLY_on(MY_CXT.default_meth);
+  MY_CXT.pp_padsv_saved = 0;
+  MY_CXT.default_meth   = newSVpvn("TYPEDSCALAR", 11);
+  SvREADONLY_on(MY_CXT.default_meth);
+ }
 
  lt_old_ck_padany    = PL_check[OP_PADANY];
  PL_check[OP_PADANY] = MEMBER_TO_FPTR(lt_ck_padany);
@@ -705,8 +716,8 @@ MODULE = Lexical::Types      PACKAGE = Lexical::Types
 
 PROTOTYPES: ENABLE
 
-BOOT: 
-{                                    
+BOOT:
+{
  if (!lt_booted++) {
   HV *stash;
 
@@ -731,9 +742,8 @@ CLONE(...)
 PROTOTYPE: DISABLE
 PREINIT:
  ptable *t;
- int    *level;
  SV     *cloned_default_meth;
-CODE:
+PPCODE:
  {
   my_cxt_t ud;
   dMY_CXT;
@@ -749,13 +759,8 @@ CODE:
   MY_CXT.pp_padsv_saved = 0;
   MY_CXT.default_meth   = cloned_default_meth;
  }
- {
-  level = PerlMemShared_malloc(sizeof *level);
-  *level = 1;
-  LEAVE_with_name("sub");
-  SAVEDESTRUCTOR_X(lt_thread_cleanup, level);
-  ENTER_with_name("sub");
- }
+ reap(3, lt_thread_cleanup, NULL);
+ XSRETURN(0);
 
 #endif