X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=deb.c;h=bc7e4196dadb9d7788ef0743c212a532d6b8ba51;hb=597c4554ca87aa4325a00c70a0fbb22acbfcfa07;hp=a3f0d4ff67ac0167e5c02da6ee950f1d31df1796;hpb=fe5bfecd71ca735f83568f7bc2b9f22cc82e3d61;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/deb.c b/deb.c
index a3f0d4f..bc7e419 100644
--- a/deb.c
+++ b/deb.c
@@ -1,7 +1,7 @@
 /*    deb.c
  *
- *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
- *    2000, 2001, 2002, 2003, 2004, 2005, 2006, by Larry Wall and others
+ *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+ *    2001, 2002, 2003, 2004, 2005, 2006, 2007, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -29,6 +29,7 @@ Perl_deb_nocontext(const char *pat, ...)
 #ifdef DEBUGGING
     dTHX;
     va_list args;
+    PERL_ARGS_ASSERT_DEB_NOCONTEXT;
     va_start(args, pat);
     vdeb(pat, &args);
     va_end(args);
@@ -42,6 +43,7 @@ void
 Perl_deb(pTHX_ const char *pat, ...)
 {
     va_list args;
+    PERL_ARGS_ASSERT_DEB;
     va_start(args, pat);
 #ifdef DEBUGGING
     vdeb(pat, &args);
@@ -60,6 +62,8 @@ Perl_vdeb(pTHX_ const char *pat, va_list *args)
     const char* const display_file = file ? file : "<free>";
     const long line = PL_curcop ? (long)CopLINE(PL_curcop) : 0;
 
+    PERL_ARGS_ASSERT_VDEB;
+
     if (DEBUG_v_TEST)
 	PerlIO_printf(Perl_debug_log, "(%ld:%s:%ld)\t",
 		      (long)PerlProc_getpid(), display_file, line);
@@ -110,6 +114,9 @@ S_deb_stack_n(pTHX_ SV** stack_base, I32 stack_min, I32 stack_max,
     dVAR;
     register I32 i = stack_max - 30;
     const I32 *markscan = PL_markstack + mark_min;
+
+    PERL_ARGS_ASSERT_DEB_STACK_N;
+
     if (i < stack_min)
 	i = stack_min;
     
@@ -293,8 +300,7 @@ Perl_deb_stack_all(pTHX)
 		if (CxTYPE(cx) == CXt_EVAL || CxTYPE(cx) == CXt_SUB
 			|| CxTYPE(cx) == CXt_FORMAT)
 		{
-		    const OP * const retop = (CxTYPE(cx) == CXt_EVAL)
-			    ? cx->blk_eval.retop : cx->blk_sub.retop;
+		    const OP * const retop = cx->blk_sub.retop;
 
 		    PerlIO_printf(Perl_debug_log, "  retop=%s\n",
 			    retop ? OP_NAME(retop) : "(null)"