Integrate:

[ 23161]
make -Dl log runops loop entry and exit, and jump level popping
p4raw-link: @23161 on //depot/perl: 9f3673fbb8fe5a0673a009424f0aef544e49f0f4

p4raw-id: //depot/maint-5.8/perl@30118
p4raw-integrated: from //depot/perl@23161 'merge in' dump.c (@22607..)
	scope.h (@23023..)

diff --git a/dump.c b/dump.c
index 907d8d7..f9f88d0 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -1614,6 +1614,7 @@ Perl_runops_debug(pTHX)
        return 0;
     }
 
+    DEBUG_l(Perl_deb(aTHX_ "Entering new RUNOPS level\n"));
     do {
        PERL_ASYNC_CHECK();
        if (PL_debug) {
@@ -1636,6 +1637,7 @@ Perl_runops_debug(pTHX)
            if (DEBUG_P_TEST_) debprof(PL_op);
        }
     } while ((PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX)));
+    DEBUG_l(Perl_deb(aTHX_ "leaving RUNOPS level\n"));
 
     TAINT_NOT;
     return 0;

diff --git a/scope.h b/scope.h
index 3ef8790..34c335f 100644 (file)
--- a/scope.h
+++ b/scope.h
@@ -414,7 +414,11 @@ typedef void *(CPERLscope(*protect_proc_t)) (pTHX_ volatile JMPENV *pcur_env,
     } STMT_END
 
 #define JMPENV_POP \
-    STMT_START { PL_top_env = cur_env.je_prev; } STMT_END
+    STMT_START {                                                       \
+       DEBUG_l(Perl_deb(aTHX_ "popping jumplevel was %p, now %p\n",    \
+                        PL_top_env, cur_env.je_prev));                 \
+       PL_top_env = cur_env.je_prev;                                   \
+    } STMT_END
 
 #define JMPENV_JUMP(v) \
     STMT_START {                                               \