diff options
| author | Charles Bailey <bailey@newman.upenn.edu> | 2000-02-26 07:04:55 +0000 |
|---|---|---|
| committer | bailey <bailey@newman.upenn.edu> | 2000-02-26 07:04:55 +0000 |
| commit | 2841d78411ddadd05a6fbe13e0be06f765fad3fb (patch) | |
| tree | 5654902690bfb2994f8fe0a17c4bb3c1d7e46797 /scope.c | |
| parent | cdc0122e98f2421b6507acbc7231bee768f9d260 (diff) | |
| parent | ffb04cf170fa14d0606f2c3643c438d43784ee46 (diff) | |
| download | perl-2841d78411ddadd05a6fbe13e0be06f765fad3fb.tar.gz | |
Resync with mainline
p4raw-id: //depot/vmsperl@5269
Diffstat (limited to 'scope.c')
| -rw-r--r-- | scope.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -16,6 +16,7 @@ #define PERL_IN_SCOPE_C #include "perl.h" +#if defined(PERL_FLEXIBLE_EXCEPTIONS) void * Perl_default_protect(pTHX_ volatile JMPENV *pcur_env, int *excpt, protect_body_t body, ...) @@ -36,8 +37,6 @@ Perl_vdefault_protect(pTHX_ volatile JMPENV *pcur_env, int *excpt, int ex; void *ret; - DEBUG_l(Perl_deb(aTHX_ "Setting up local jumplevel %p, was %p\n", - pcur_env, PL_top_env)); JMPENV_PUSH(ex); if (ex) ret = NULL; @@ -47,6 +46,7 @@ Perl_vdefault_protect(pTHX_ volatile JMPENV *pcur_env, int *excpt, JMPENV_POP; return ret; } +#endif SV** Perl_stack_grow(pTHX_ SV **sp, SV **p, int n) @@ -994,8 +994,9 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_OP_TYPE = %s (%s)\n", PL_op_name[cx->blk_eval.old_op_type], PL_op_desc[cx->blk_eval.old_op_type]); - PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_NAME = %s\n", - cx->blk_eval.old_name); + if (cx->blk_eval.old_namesv) + PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_NAME = %s\n", + SvPVX(cx->blk_eval.old_namesv)); PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_EVAL_ROOT = 0x%"UVxf"\n", PTR2UV(cx->blk_eval.old_eval_root)); break; |