X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=indirect.xs;h=00622a5c10f5b2d5b3488ed2ca40f8b600dfdffe;hp=12e83d5c92ad1fe3b3c7265655371165cb69491d;hb=c07766a234204d78a80b6d75534e03ae3465b6f3;hpb=9856d89db33e335664cca6910de72b53e0e12763

diff --git a/indirect.xs b/indirect.xs
index 12e83d5..00622a5 100644
--- a/indirect.xs
+++ b/indirect.xs
@@ -35,6 +35,10 @@
 # define SvPVX_const SvPVX
 #endif
 
+#ifndef SvREFCNT_inc_simple_NN
+# define SvREFCNT_inc_simple_NN SvREFCNT_inc
+#endif
+
 #ifndef sv_catpvn_nomg
 # define sv_catpvn_nomg sv_catpvn
 #endif
@@ -260,12 +264,21 @@ STATIC void indirect_thread_cleanup(pTHX_ void *ud) {
 STATIC SV *indirect_tag(pTHX_ SV *value) {
 #define indirect_tag(V) indirect_tag(aTHX_ (V))
  indirect_hint_t *h;
+ SV *code = NULL;
  dMY_CXT;
 
- value = SvOK(value) && SvROK(value) ? SvRV(value) : NULL;
+ if (SvROK(value)) {
+  value = SvRV(value);
+  if (SvTYPE(value) >= SVt_PVCV) {
+   code = value;
+   if (CvANON(code) && !CvCLONED(code))
+    CvCLONE_on(code);
+   SvREFCNT_inc_simple_NN(code);
+  }
+ }
 
  h = PerlMemShared_malloc(sizeof *h);
- h->code = SvREFCNT_inc(value);
+ h->code = code;
 
 #if I_WORKAROUND_REQUIRE_PROPAGATION
  {
@@ -289,10 +302,10 @@ STATIC SV *indirect_tag(pTHX_ SV *value) {
 
  /* We only need for the key to be an unique tag for looking up the value later.
   * Allocated memory provides convenient unique identifiers, so that's why we
-  * use the value pointer as the key itself. */
- ptable_hints_store(MY_CXT.tbl, value, h);
+  * use the hint as the key itself. */
+ ptable_hints_store(MY_CXT.tbl, h, h);
 
- return newSVuv(PTR2UV(value));
+ return newSViv(PTR2IV(h));
 }
 
 STATIC SV *indirect_detag(pTHX_ const SV *hint) {
@@ -300,10 +313,10 @@ STATIC SV *indirect_detag(pTHX_ const SV *hint) {
  indirect_hint_t *h;
  dMY_CXT;
 
- if (!(hint && SvOK(hint) && SvIOK(hint)))
+ if (!(hint && SvIOK(hint)))
   return NULL;
 
- h = ptable_fetch(MY_CXT.tbl, INT2PTR(void *, SvUVX(hint)));
+ h = ptable_fetch(MY_CXT.tbl, INT2PTR(void *, SvIVX(hint)));
 
 #if I_WORKAROUND_REQUIRE_PROPAGATION
  {
@@ -333,16 +346,16 @@ STATIC SV *indirect_tag(pTHX_ SV *value) {
 #define indirect_tag(V) indirect_tag(aTHX_ (V))
  UV tag = 0;
 
- if (SvOK(value) && SvROK(value)) {
+ if (SvROK(value)) {
   value = SvRV(value);
-  SvREFCNT_inc(value);
-  tag = PTR2UV(value);
+  SvREFCNT_inc_simple_NN(value);
+  tag = PTR2IV(value);
  }
 
- return newSVuv(tag);
+ return newSViv(tag);
 }
 
-#define indirect_detag(H) (((H) && SvOK(H)) ? INT2PTR(SV *, SvUVX(H)) : NULL)
+#define indirect_detag(H) (((H) && SvIOK(H)) ? INT2PTR(SV *, SvIVX(H)) : NULL)
 
 #endif /* I_THREADSAFE || I_WORKAROUND_REQUIRE_PROPAGATION */
 
@@ -351,6 +364,10 @@ STATIC U32 indirect_hash = 0;
 STATIC SV *indirect_hint(pTHX) {
 #define indirect_hint() indirect_hint(aTHX)
  SV *hint;
+
+ if (IN_PERL_RUNTIME)
+  return NULL;
+
 #if I_HAS_PERL(5, 9, 5)
  hint = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
                                        NULL,
@@ -358,11 +375,13 @@ STATIC SV *indirect_hint(pTHX) {
                                        0,
                                        indirect_hash);
 #else
- SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__,
+ {
+  SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__,
                                                                  indirect_hash);
- if (!val)
-  return 0;
- hint = *val;
+  if (!val)
+   return 0;
+  hint = *val;
+ }
 #endif
  return indirect_detag(hint);
 }
@@ -395,13 +414,20 @@ STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv, line_
   oi->size = 0;
  }
 
- s = SvPV_const(sv, len);
+ if (sv) {
+  s = SvPV_const(sv, len);
+ } else {
+  s   = "{";
+  len = 1;
+ }
+
  if (len > oi->size) {
   Safefree(oi->buf);
   Newx(oi->buf, len, char);
   oi->size = len;
  }
  Copy(s, oi->buf, len, char);
+
  oi->len  = len;
  oi->pos  = src;
  oi->line = line;
@@ -564,6 +590,32 @@ STATIC OP *indirect_ck_padany(pTHX_ OP *o) {
  return o;
 }
 
+/* ... ck_scope ............................................................ */
+
+STATIC OP *(*indirect_old_ck_scope)  (pTHX_ OP *) = 0;
+STATIC OP *(*indirect_old_ck_lineseq)(pTHX_ OP *) = 0;
+
+STATIC OP *indirect_ck_scope(pTHX_ OP *o) {
+ OP *(*old_ck)(pTHX_ OP *) = 0;
+
+ switch (o->op_type) {
+  case OP_SCOPE:   old_ck = indirect_old_ck_scope;   break;
+  case OP_LINESEQ: old_ck = indirect_old_ck_lineseq; break;
+ }
+ o = CALL_FPTR(old_ck)(aTHX_ o);
+
+ if (indirect_hint()) {
+  indirect_map_store(o, PL_oldbufptr, NULL, CopLINE(&PL_compiling));
+  return o;
+ }
+
+ indirect_map_delete(o);
+ return o;
+}
+
+/* We don't need to clean the map entries for leave ops because they can only
+ * be created by mutating from a lineseq. */
+
 /* ... ck_method ........................................................... */
 
 STATIC OP *(*indirect_old_ck_method)(pTHX_ OP *) = 0;
@@ -643,6 +695,8 @@ STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
    case OP_CONST:
    case OP_RV2SV:
    case OP_PADSV:
+   case OP_SCOPE:
+   case OP_LEAVE:
     break;
    default:
     goto done;
@@ -726,6 +780,11 @@ BOOT:
   PL_check[OP_RV2SV]       = MEMBER_TO_FPTR(indirect_ck_rv2sv);
   indirect_old_ck_padany   = PL_check[OP_PADANY];
   PL_check[OP_PADANY]      = MEMBER_TO_FPTR(indirect_ck_padany);
+  indirect_old_ck_scope    = PL_check[OP_SCOPE];
+  PL_check[OP_SCOPE]       = MEMBER_TO_FPTR(indirect_ck_scope);
+  indirect_old_ck_lineseq  = PL_check[OP_LINESEQ];
+  PL_check[OP_LINESEQ]     = MEMBER_TO_FPTR(indirect_ck_scope);
+
   indirect_old_ck_method   = PL_check[OP_METHOD];
   PL_check[OP_METHOD]      = MEMBER_TO_FPTR(indirect_ck_method);
   indirect_old_ck_entersub = PL_check[OP_ENTERSUB];