phpdbg next command must step over function calls

This was broken in cf35dae. The fix is to try to better target the fix
applied in that patch to only instances where we have left the current
context and entered the previous context.

Author: ebernhardson

NEWS

@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 7.3.23
 
+- phpdbg:
+  . Fixed bug #80006 (phpdbg next command doesn't step over).
+    (Erik Bernhardson)
 
 03 Sep 2020, PHP 7.3.22
 

sapi/phpdbg/phpdbg_prompt.c

@@ -1802,16 +1802,13 @@ void phpdbg_execute_ex(zend_execute_data *execute_data) /* {{{ */
 			goto next;
 		}
 
-		/* not while in conditionals */
-		phpdbg_print_opline_ex(execute_data, 0);
-
 		/* perform seek operation */
 		if ((PHPDBG_G(flags) & PHPDBG_SEEK_MASK) && !(PHPDBG_G(flags) & PHPDBG_IN_EVAL)) {
 			/* current address */
 			zend_ulong address = (zend_ulong) execute_data->opline;
 
 			if (PHPDBG_G(seek_ex) != execute_data) {
-				if (PHPDBG_G(flags) & PHPDBG_IS_STEPPING) {
+				if (PHPDBG_G(seek_ex)->prev_execute_data == execute_data && PHPDBG_G(flags) & PHPDBG_IS_STEPPING) {
 					goto stepping;
 				}
 				goto next;
@@ -1857,6 +1854,9 @@ void phpdbg_execute_ex(zend_execute_data *execute_data) /* {{{ */
 			}
 		}
 
+		/* not while in conditionals */
+		phpdbg_print_opline_ex(execute_data, 0);
+
 		if (PHPDBG_G(flags) & PHPDBG_IS_STEPPING && (PHPDBG_G(flags) & PHPDBG_STEP_OPCODE || execute_data->opline->lineno != PHPDBG_G(last_line))) {
 stepping:
 			PHPDBG_G(flags) &= ~PHPDBG_IS_STEPPING;

sapi/phpdbg/tests/next_001.phpt

@@ -19,8 +19,7 @@ prompt> 0
 >00005: }
  00006: 
  00007: foo();
-prompt> [L8 %s ECHO                    1                                                              %s]
->00008: echo 1;
+prompt> >00008: echo 1;
  00009: 
 prompt> 1
 [L9 %s RETURN<-1>              1                                                              %s]

sapi/phpdbg/tests/next_002.phpt

@@ -0,0 +1,34 @@
+--TEST--
+Test next command step over functionality
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
+--PHPDBG--
+b 7
+r
+n
+q
+--EXPECTF--
+[Successful compilation of %s]
+prompt> [Breakpoint #0 added at %s:7]
+prompt> [Breakpoint #0 at %s:7, hits: 1]
+>00007: foo();
+ 00008: echo 1;
+ 00009: 
+prompt> 0
+[L8       %s ECHO                    1                                                              %s]
+>00008: echo 1;
+ 00009: 
+prompt> 
+--FILE--
+<?php
+
+function foo() {
+	echo 0;
+}
+
+foo();
+echo 1;