summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cop.h2
-rw-r--r--pp_ctl.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/cop.h b/cop.h
index 268c24fdcc..2657ffbd6e 100644
--- a/cop.h
+++ b/cop.h
@@ -752,7 +752,7 @@ struct block_eval {
assert(!(PL_in_eval & ~0x7F)); \
assert(!(PL_op->op_type & ~0x1FF)); \
cx->blk_u16 = (PL_in_eval & 0x7F) | ((U16)PL_op->op_type << 7); \
- cx->blk_eval.old_namesv = (n ? newSVpv(n,0) : NULL); \
+ cx->blk_eval.old_namesv = (n); \
cx->blk_eval.old_eval_root = PL_eval_root; \
cx->blk_eval.cur_text = PL_parser ? PL_parser->linestr : NULL; \
cx->blk_eval.cv = NULL; /* set by doeval_compile() as applicable */ \
diff --git a/pp_ctl.c b/pp_ctl.c
index 16d5e11677..8fa013b801 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -4042,7 +4042,7 @@ PP(pp_require)
/* switch to eval mode */
PUSHBLOCK(cx, CXt_EVAL, gimme, SP, old_savestack_ix);
- PUSHEVAL(cx, PL_op->op_next, name);
+ PUSHEVAL(cx, PL_op->op_next, newSVpv(name, 0));
SAVECOPLINE(&PL_compiling);
CopLINE_set(&PL_compiling, 0);
@@ -4156,7 +4156,7 @@ PP(pp_entereval)
runcv = find_runcv(&seq);
PUSHBLOCK(cx, (CXt_EVAL|CXp_REAL), gimme, SP, old_savestack_ix);
- PUSHEVAL(cx, PL_op->op_next, 0);
+ PUSHEVAL(cx, PL_op->op_next, NULL);
/* prepare to compile string */
@@ -4286,7 +4286,7 @@ Perl_create_eval_scope(pTHX_ OP *retop, U32 flags)
const I32 gimme = GIMME_V;
PUSHBLOCK(cx, (CXt_EVAL|CXp_TRYBLOCK), gimme, PL_stack_sp, PL_savestack_ix);
- PUSHEVAL(cx, retop, 0);
+ PUSHEVAL(cx, retop, NULL);
PL_in_eval = EVAL_INEVAL;
if (flags & G_KEEPERR)