[MERGE] resolve conflicts and merge 5.25.1 release with blead

[perl5.git] / run.c

diff --git a/run.c b/run.c
index be280ee..352bfbc 100644 (file)
--- a/run.c
+++ b/run.c
@@ -30,27 +30,23 @@
  *  Now we are come to the lands where you were foaled, and every stone you
  *  know.  Run now!  Hope is in speed!'                    --Gandalf
  *
- *     [p.600 of _The Lord of the Rings_, III/xi: "The Palantír"]
+ *     [p.600 of _The Lord of the Rings_, III/xi: "The Palantír"]
  */
 
 int
 Perl_runops_standard(pTHX)
 {
-    dVAR;
-    while ((PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX))) {
-       PERL_ASYNC_CHECK();
+    OP *op = PL_op;
+    PERL_DTRACE_PROBE_OP(op);
+    while ((PL_op = op = op->op_ppaddr(aTHX))) {
+        PERL_DTRACE_PROBE_OP(op);
     }
+    PERL_ASYNC_CHECK();
 
     TAINT_NOT;
     return 0;
 }
 
 /*
- * Local variables:
- * c-indentation-style: bsd
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- *
- * ex: set ts=8 sts=4 sw=4 noet:
+ * ex: set ts=8 sts=4 sw=4 et:
  */