(retracted by #12951)

[perl5.git] / run.c

diff --git a/run.c b/run.c
index 702a9b9..34dfc9b 100644 (file)
--- a/run.c
+++ b/run.c
@@ -67,7 +67,7 @@ Perl_debop(pTHX_ OP *o)
     CV *cv;
     SV *sv;
     STRLEN n_a;
-    Perl_deb(aTHX_ "%s", PL_op_name[o->op_type]);
+    Perl_deb(aTHX_ "%s", OP_NAME(o));
     switch (o->op_type) {
     case OP_CONST:
        PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOPo_sv));
@@ -107,15 +107,14 @@ Perl_debop(pTHX_ OP *o)
     return 0;
 }
 
+#ifdef DEBUGGING
+
 STATIC CV*
-S_deb_curcv(I32 ix)
+S_deb_curcv(pTHX_ I32 ix)
 {
-#ifdef DEBUGGING
     PERL_CONTEXT *cx = &cxstack[ix];
     if (CxTYPE(cx) == CXt_SUB || CxTYPE(cx) == CXt_FORMAT)
         return cx->blk_sub.cv;
-    else if (CxTYPE(cx) == CXt_EVAL && CxREALEVAL(cx))
-        return PL_compcv;
     else if (CxTYPE(cx) == CXt_EVAL && !CxTRYBLOCK(cx))
         return PL_compcv;
     else if (ix == 0 && PL_curstackinfo->si_type == PERLSI_MAIN)
@@ -124,11 +123,10 @@ S_deb_curcv(I32 ix)
         return Nullcv;
     else
         return deb_curcv(ix - 1);
-#else
-    return Nullcv;
-#endif  /* DEBUGGING */
 }
 
+#endif  /* DEBUGGING */
+
 void
 Perl_watch(pTHX_ char **addr)
 {
@@ -140,16 +138,18 @@ Perl_watch(pTHX_ char **addr)
 #endif /* DEBUGGING */
 }
 
+#ifdef DEBUGGING
+
 STATIC void
 S_debprof(pTHX_ OP *o)
 {
-#ifdef DEBUGGING
     if (!PL_profiledata)
        Newz(000, PL_profiledata, MAXO, U32);
     ++PL_profiledata[o->op_type];
-#endif /* DEBUGGING */
 }
 
+#endif /* DEBUGGING */
+
 void
 Perl_debprofdump(pTHX)
 {