summaryrefslogtreecommitdiff
path: root/pp_ctl.c
diff options
context:
space:
mode:
authorDavid Mitchell <davem@iabyn.com>2010-07-03 13:36:59 +0100
committerDavid Mitchell <davem@iabyn.com>2010-07-03 16:25:58 +0100
commit79a8d5295c08d08001ca69256d5a990d05ee1556 (patch)
treedfe5592a2494b41e6ae2650e2b5c44cc0efbab89 /pp_ctl.c
parent5a8697a75658d7d8584bbfa20c013c177b3dbac3 (diff)
downloadperl-79a8d5295c08d08001ca69256d5a990d05ee1556.tar.gz
PL_amagic_generation doesn't show overload loaded
PL_amagic_generation is non-zero even without the presence of 'use overload', so don't bother using it as a short-cut test of whether we can skip AMAGIC processing
Diffstat (limited to 'pp_ctl.c')
-rw-r--r--pp_ctl.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/pp_ctl.c b/pp_ctl.c
index 1aca2a07ea..ccda760ca6 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -117,17 +117,15 @@ PP(pp_regcomp)
sv_setpvs(tmpstr, "");
while (++MARK <= SP) {
SV *msv = *MARK;
- if (PL_amagic_generation) {
- SV *sv;
+ SV *sv;
- tryAMAGICregexp(msv);
+ tryAMAGICregexp(msv);
- if ((SvAMAGIC(tmpstr) || SvAMAGIC(msv)) &&
- (sv = amagic_call(tmpstr, msv, concat_amg, AMGf_assign)))
- {
- sv_setsv(tmpstr, sv);
- continue;
- }
+ if ((SvAMAGIC(tmpstr) || SvAMAGIC(msv)) &&
+ (sv = amagic_call(tmpstr, msv, concat_amg, AMGf_assign)))
+ {
+ sv_setsv(tmpstr, sv);
+ continue;
}
sv_catsv(tmpstr, msv);
}