Merge branch 'PHP-7.0' into PHP-7.1

weltling · weltling · commit 8f256bebef34 · 2016-09-23T11:25:33.000+02:00
* PHP-7.0:
  update NEWS
  phpdbg next command must stop when leaving function
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
@@ -1535,12 +1535,18 @@ 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) {
+					goto stepping;
+				}
 				goto next;
 			}
 
@@ -1584,10 +1590,8 @@ 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;
 			DO_INTERACTIVE(1);
 		}
diff --git a/sapi/phpdbg/tests/next_001.phpt b/sapi/phpdbg/tests/next_001.phpt
@@ -0,0 +1,37 @@
+--TEST--
+Test next command on function boundaries
+--PHPDBG--
+b 4
+r
+n
+
+
+q
+--EXPECTF--
+[Successful compilation of %s]
+prompt> [Breakpoint #0 added at %s:4]
+prompt> [Breakpoint #0 at %s:4, hits: 1]
+>00004: 	echo 0;
+ 00005: }
+ 00006: 
+prompt> 0
+[L5 %s RETURN                  null                                                           %s]
+>00005: }
+ 00006: 
+ 00007: foo();
+prompt> [L8 %s ECHO                    1                                                              %s]
+>00008: echo 1;
+ 00009: 
+prompt> 1
+[L8 %s RETURN                  1                                                              %s]
+[Script ended normally]
+prompt> 
+--FILE--
+<?php
+
+function foo() {
+	echo 0;
+}
+
+foo();
+echo 1;

Original file line number	Diff line number	Diff line change
`@@ -1535,12 +1535,18 @@ void phpdbg_execute_ex(zend_execute_data execute_data) / {{{ */`
`1535`	`1535`	`goto next;`
`1536`	`1536`	`}`
`1537`	`1537`
	`1538`	`+ /* not while in conditionals */`
	`1539`	`+ phpdbg_print_opline_ex(execute_data, 0);`
	`1540`	`+`
`1538`	`1541`	`/* perform seek operation */`
`1539`	`1542`	`if ((PHPDBG_G(flags) & PHPDBG_SEEK_MASK) && !(PHPDBG_G(flags) & PHPDBG_IN_EVAL)) {`
`1540`	`1543`	`/* current address */`
`1541`	`1544`	`zend_ulong address = (zend_ulong) execute_data->opline;`
`1542`	`1545`
`1543`	`1546`	`if (PHPDBG_G(seek_ex) != execute_data) {`
	`1547`	`+ if (PHPDBG_G(flags) & PHPDBG_IS_STEPPING) {`
	`1548`	`+ goto stepping;`
	`1549`	`+ }`
`1544`	`1550`	`goto next;`
`1545`	`1551`	`}`
`1546`	`1552`
`@@ -1584,10 +1590,8 @@ void phpdbg_execute_ex(zend_execute_data execute_data) / {{{ */`
`1584`	`1590`	`}`
`1585`	`1591`	`}`
`1586`	`1592`
`1587`		`- /* not while in conditionals */`
`1588`		`- phpdbg_print_opline_ex(execute_data, 0);`
`1589`		`-`
`1590`	`1593`	`if (PHPDBG_G(flags) & PHPDBG_IS_STEPPING && (PHPDBG_G(flags) & PHPDBG_STEP_OPCODE \|\| execute_data->opline->lineno != PHPDBG_G(last_line))) {`
	`1594`	`+stepping:`
`1591`	`1595`	`PHPDBG_G(flags) &= ~PHPDBG_IS_STEPPING;`
`1592`	`1596`	`DO_INTERACTIVE(1);`
`1593`	`1597`	`}`