SV *comp;
SV *exec;
#if REP_WORKAROUND_REQUIRE_PROPAGATION
- IV cxreq;
+ IV require_tag;
#endif
} rep_hint_t;
SvREFCNT_dec(stashes);
}
- return SvREFCNT_inc(dupsv);
+ return SvREFCNT_inc_simple(dupsv);
}
STATIC void rep_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
if (ud->owner == aTHX)
return;
- h2 = PerlMemShared_malloc(sizeof *h2);
- h2->comp = rep_clone(h1->comp, ud->owner);
- SvREFCNT_inc(h2->comp);
- h2->exec = rep_clone(h1->exec, ud->owner);
- SvREFCNT_inc(h2->exec);
+ h2 = PerlMemShared_malloc(sizeof *h2);
+ h2->comp = rep_clone(h1->comp, ud->owner);
+ SvREFCNT_inc_simple_void(h2->comp);
+ h2->exec = rep_clone(h1->exec, ud->owner);
+ SvREFCNT_inc_simple_void(h2->exec);
#if REP_WORKAROUND_REQUIRE_PROPAGATION
- h2->cxreq = h1->cxreq;
+ h2->require_tag = PTR2IV(rep_clone(INT2PTR(SV *, h1->require_tag), ud->owner));
#endif
ptable_store(ud->tbl, ent->key, h2);
#if REP_WORKAROUND_REQUIRE_PROPAGATION
STATIC IV rep_require_tag(pTHX) {
#define rep_require_tag() rep_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 /* REP_WORKAROUND_REQUIRE_PROPAGATION */
rep_hint_t *h;
dMY_CXT;
- h = PerlMemShared_malloc(sizeof *h);
- h->comp = rep_validate_callback(comp);
- h->exec = rep_validate_callback(exec);
+ h = PerlMemShared_malloc(sizeof *h);
+ h->comp = rep_validate_callback(comp);
+ h->exec = rep_validate_callback(exec);
#if REP_WORKAROUND_REQUIRE_PROPAGATION
- h->cxreq = rep_require_tag();
+ h->require_tag = rep_require_tag();
#endif /* REP_WORKAROUND_REQUIRE_PROPAGATION */
#if REP_THREADSAFE
- /* 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 hint as the key itself. */
- ptable_store(MY_CXT.tbl, h, h);
+ {
+ dMY_CXT;
+ /* 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 hint as the key itself. */
+ ptable_store(MY_CXT.tbl, h, h);
+ }
#endif /* REP_THREADSAFE */
return newSViv(PTR2IV(h));
STATIC const rep_hint_t *rep_detag(pTHX_ const SV *hint) {
#define rep_detag(H) rep_detag(aTHX_ (H))
rep_hint_t *h;
- dMY_CXT;
if (!(hint && SvIOK(hint)))
return NULL;
h = INT2PTR(rep_hint_t *, SvIVX(hint));
#if REP_THREADSAFE
- h = ptable_fetch(MY_CXT.tbl, h);
+ {
+ dMY_CXT;
+ h = ptable_fetch(MY_CXT.tbl, h);
+ }
#endif /* REP_THREADSAFE */
#if REP_WORKAROUND_REQUIRE_PROPAGATION
- if (rep_require_tag() != h->cxreq)
+ if (rep_require_tag() != h->require_tag)
return NULL;
#endif /* REP_WORKAROUND_REQUIRE_PROPAGATION */
/* Our blessed object */
obj = newSV(0);
- SvREFCNT_inc(obj);
+ SvREFCNT_inc_simple_void_NN(obj);
Newxz(re, 1, struct replug);
sv_setref_pv(obj, "re::engine::Plugin", (void*)re);
/* Store the pattern for ->pattern */
re->pattern = (SV*)pattern;
- SvREFCNT_inc(re->pattern);
+ SvREFCNT_inc_simple_void(re->pattern);
/* If there's an exec callback, store it into the private object so
* that it will be the one to be called, even if the engine changes
SV *ret;
/* Store the current str for ->str */
- self->str = (SV*)sv;
- SvREFCNT_inc(self->str);
+ SvREFCNT_dec(self->str);
+ self->str = sv;
+ SvREFCNT_inc_simple_void(self->str);
ENTER;
SAVETMPS;
STATIC U32 rep_initialized = 0;
STATIC void rep_teardown(pTHX_ void *root) {
- dMY_CXT;
-
if (!rep_initialized || aTHX != root)
return;
- ptable_free(MY_CXT.tbl);
+ {
+ dMY_CXT;
+ ptable_free(MY_CXT.tbl);
+ }
rep_initialized = 0;
}
if (rep_initialized)
return;
- MY_CXT_INIT;
- MY_CXT.tbl = ptable_new();
- MY_CXT.owner = aTHX;
+ {
+ MY_CXT_INIT;
+ MY_CXT.tbl = ptable_new();
+ MY_CXT.owner = aTHX;
+ }
call_atexit(rep_teardown, aTHX);
stash(re::engine::Plugin self, ...)
PPCODE:
if (items > 1) {
+ SvREFCNT_dec(self->stash);
self->stash = ST(1);
- SvREFCNT_inc(self->stash);
+ SvREFCNT_inc_simple_void(self->stash);
XSRETURN_EMPTY;
} else {
XPUSHs(self->stash);
if (items > 1) {
SvREFCNT_dec(self->cb_exec);
self->cb_exec = ST(1);
- SvREFCNT_inc(self->cb_exec);
+ SvREFCNT_inc_simple_void(self->cb_exec);
}
void
if (items > 1) {
SvREFCNT_dec(self->cb_num_capture_buff_FETCH);
self->cb_num_capture_buff_FETCH = ST(1);
- SvREFCNT_inc(self->cb_num_capture_buff_FETCH);
+ SvREFCNT_inc_simple_void(self->cb_num_capture_buff_FETCH);
}
void
if (items > 1) {
SvREFCNT_dec(self->cb_num_capture_buff_STORE);
self->cb_num_capture_buff_STORE = ST(1);
- SvREFCNT_inc(self->cb_num_capture_buff_STORE);
+ SvREFCNT_inc_simple_void(self->cb_num_capture_buff_STORE);
}
void
if (items > 1) {
SvREFCNT_dec(self->cb_num_capture_buff_LENGTH);
self->cb_num_capture_buff_LENGTH = ST(1);
- SvREFCNT_inc(self->cb_num_capture_buff_LENGTH);
+ SvREFCNT_inc_simple_void(self->cb_num_capture_buff_LENGTH);
}
SV *
projects / perl / modules / re-engine-Plugin.git / blobdiff