This is 0.14

[perl/modules/indirect.git] / indirect.xs

diff --git a/indirect.xs b/indirect.xs
index 4e538b3d63ca7803d4ba7222d9eed839416fba7a..12256c3544ea418e84420c9f4a12df471379c688 100644 (file)
--- a/indirect.xs
+++ b/indirect.xs
@@ -134,12 +134,8 @@ typedef struct {
 
 #define PTABLE_NAME ptable_hints
 
-#if I_WORKAROUND_REQUIRE_PROPAGATION
-# define PTABLE_VAL_FREE(V) \
+#define PTABLE_VAL_FREE(V) \
    { indirect_hint_t *h = (V); SvREFCNT_dec(h->code); PerlMemShared_free(h); }
-#else
-# define PTABLE_VAL_FREE(V) SvREFCNT_dec(V)
-#endif
 
 #define pPTBL  pTHX
 #define pPTBL_ pTHX_
@@ -391,6 +387,13 @@ STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) {
  return INT2PTR(const char *, SvUVX(val));
 }
 
+STATIC void indirect_map_delete(pTHX_ const OP *o) {
+#define indirect_map_delete(O) indirect_map_delete(aTHX_ (O))
+ dMY_CXT;
+
+ ptable_store(MY_CXT.map, o, NULL);
+}
+
 /* --- Check functions ----------------------------------------------------- */
 
 STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) {
@@ -426,10 +429,13 @@ STATIC OP *indirect_ck_const(pTHX_ OP *o) {
 
  if (indirect_hint()) {
   SV *sv = cSVOPo_sv;
-  if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV))
+  if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV)) {
    indirect_map_store(o, indirect_find(sv, PL_oldbufptr), sv);
+   return o;
+  }
  }
 
+ indirect_map_delete(o);
  return o;
 }
 
@@ -494,7 +500,10 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
  }
 
 done:
- return CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+ o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+
+ indirect_map_delete(o);
+ return o;
 }
 
 /* ... ck_padany ........................................................... */
@@ -515,9 +524,11 @@ STATIC OP *indirect_ck_padany(pTHX_ OP *o) {
    sv = sv_2mortal(newSVpvn("$", 1));
    sv_catpvn_nomg(sv, s, t - s + 1);
    indirect_map_store(o, s, sv);
+   return o;
   }
  }
 
+ indirect_map_delete(o);
  return o;
 }
 
@@ -544,7 +555,10 @@ STATIC OP *indirect_ck_method(pTHX_ OP *o) {
  }
 
 done:
- return CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
+ o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
+
+ indirect_map_delete(o);
+ return o;
 }
 
 /* ... ck_entersub ......................................................... */
@@ -572,6 +586,18 @@ STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
   oop = oop->op_sibling;
   mop = lop->op_last;
 
+  if (!oop)
+   goto done;
+
+  switch (oop->op_type) {
+   case OP_CONST:
+   case OP_RV2SV:
+   case OP_PADSV:
+    break;
+   default:
+    goto done;
+  }
+
   if (mop->op_type == OP_METHOD)
    mop = cUNOPx(mop)->op_first;
   else if (mop->op_type != OP_METHOD_NAMED)