#define I_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
-#undef ENTERn
-#if defined(ENTER_with_name) && !I_HAS_PERL(5, 11, 4)
-# define ENTERn(N) ENTER_with_name(N)
-#else
-# define ENTERn(N) ENTER
-#endif
-
-#undef LEAVEn
-#if defined(LEAVE_with_name) && !I_HAS_PERL(5, 11, 4)
-# define LEAVEn(N) LEAVE_with_name(N)
-#else
-# define LEAVEn(N) LEAVE
-#endif
-
#if I_HAS_PERL(5, 10, 0) || defined(PL_parser)
-# ifndef PL_lex_inwhat
-# define PL_lex_inwhat PL_parser->lex_inwhat
-# endif
-# ifndef PL_linestr
-# define PL_linestr PL_parser->linestr
-# endif
# ifndef PL_bufptr
# define PL_bufptr PL_parser->bufptr
# endif
# define PL_oldbufptr PL_parser->oldbufptr
# endif
#else
-# ifndef PL_lex_inwhat
-# define PL_lex_inwhat PL_Ilex_inwhat
-# endif
-# ifndef PL_linestr
-# define PL_linestr PL_Ilinestr
-# endif
# ifndef PL_bufptr
# define PL_bufptr PL_Ibufptr
# endif
typedef struct {
#if I_THREADSAFE
- ptable *tbl; /* It really is a ptable_hints */
- tTHX owner;
+ ptable *tbl; /* It really is a ptable_hints */
+ tTHX owner;
#endif
- ptable *map;
- const char *linestr;
+ ptable *map;
} my_cxt_t;
START_MY_CXT
ptable_hints_store(ud->tbl, ent->key, h2);
}
-STATIC void indirect_thread_cleanup(pTHX_ void *);
+#include "reap.h"
STATIC void indirect_thread_cleanup(pTHX_ void *ud) {
- int *level = ud;
+ dMY_CXT;
- if (*level) {
- *level = 0;
- LEAVE;
- SAVEDESTRUCTOR_X(indirect_thread_cleanup, level);
- ENTER;
- } else {
- dMY_CXT;
- PerlMemShared_free(level);
- ptable_free(MY_CXT.map);
- ptable_hints_free(MY_CXT.tbl);
- }
+ ptable_free(MY_CXT.map);
+ ptable_hints_free(MY_CXT.tbl);
}
#endif /* I_THREADSAFE */
STRLEN len;
dMY_CXT;
- /* When lex_inwhat is set, we're in a quotelike environment (qq, qr, but not q)
- * In this case the linestr has temporarly changed, but the old buffer should
- * still be alive somewhere. */
-
- if (!PL_lex_inwhat) {
- const char *pl_linestr = SvPVX_const(PL_linestr);
- if (MY_CXT.linestr != pl_linestr) {
- ptable_clear(MY_CXT.map);
- MY_CXT.linestr = pl_linestr;
- }
- }
-
if (!(oi = ptable_fetch(MY_CXT.map, o))) {
Newx(oi, 1, indirect_op_info_t);
ptable_store(MY_CXT.map, o, oi);
#define indirect_map_fetch(O) indirect_map_fetch(aTHX_ (O))
dMY_CXT;
- if (MY_CXT.linestr != SvPVX_const(PL_linestr))
- return NULL;
-
return ptable_fetch(MY_CXT.map, o);
}
STATIC OP *indirect_ck_method(pTHX_ OP *o) {
if (indirect_hint()) {
OP *op = cUNOPo->op_first;
- const indirect_op_info_t *oi = indirect_map_fetch(op);
- const char *s = NULL;
- line_t line;
- SV *sv;
- if (oi && (s = oi->pos)) {
- sv = sv_2mortal(newSVpvn(oi->buf, oi->len));
- line = oi->line; /* Keep the old line so that we really point to the first */
- } else {
- sv = cSVOPx_sv(op);
- if (!SvPOK(sv) || (SvTYPE(sv) < SVt_PV))
- goto done;
- sv = sv_mortalcopy(sv);
- s = indirect_find(sv, PL_oldbufptr);
- line = CopLINE(&PL_compiling);
- }
+ /* Indirect method call is only possible when the method is a bareword, so
+ * don't trip up on $obj->$meth. */
+ if (op && op->op_type == OP_CONST) {
+ const indirect_op_info_t *oi = indirect_map_fetch(op);
+ const char *s = NULL;
+ line_t line;
+ SV *sv;
+
+ if (oi && (s = oi->pos)) {
+ sv = sv_2mortal(newSVpvn(oi->buf, oi->len));
+ /* Keep the old line so that we really point to the first line of the
+ * expression. */
+ line = oi->line;
+ } else {
+ sv = cSVOPx_sv(op);
+ if (!SvPOK(sv) || (SvTYPE(sv) < SVt_PV))
+ goto done;
+ sv = sv_mortalcopy(sv);
+ s = indirect_find(sv, PL_oldbufptr);
+ line = CopLINE(&PL_compiling);
+ }
- o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
- /* o may now be a method_named */
+ o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
+ /* o may now be a method_named */
- indirect_map_store(o, s, sv, line);
- return o;
+ indirect_map_store(o, s, sv, line);
+ return o;
+ }
}
done:
{
MY_CXT_INIT;
#if I_THREADSAFE
- MY_CXT.tbl = ptable_new();
- MY_CXT.owner = aTHX;
+ MY_CXT.tbl = ptable_new();
+ MY_CXT.owner = aTHX;
#endif
- MY_CXT.map = ptable_new();
- MY_CXT.linestr = NULL;
+ MY_CXT.map = ptable_new();
}
indirect_old_ck_const = PL_check[OP_CONST];
PROTOTYPE: DISABLE
PREINIT:
ptable *t;
- int *level;
PPCODE:
{
my_cxt_t ud;
}
{
MY_CXT_CLONE;
- MY_CXT.map = ptable_new();
- MY_CXT.linestr = NULL;
- MY_CXT.tbl = t;
- MY_CXT.owner = aTHX;
- }
- {
- level = PerlMemShared_malloc(sizeof *level);
- *level = 1;
- LEAVEn("sub");
- SAVEDESTRUCTOR_X(indirect_thread_cleanup, level);
- ENTERn("sub");
+ MY_CXT.map = ptable_new();
+ MY_CXT.tbl = t;
+ MY_CXT.owner = aTHX;
}
+ reap(3, indirect_thread_cleanup, NULL);
XSRETURN(0);
#endif