archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-7.0'

Browse source
This commit is contained in:
Bob Weinand 2016-09-23 03:29:56 +02:00
commit a137a1e255
2 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sapi/phpdbg/phpdbg_prompt.c
View file

@ -1535,12 +1535,18 @@ ex_is_caught:
goto next; goto next;
} }
/* not while in conditionals */
phpdbg_print_opline_ex(execute_data, 0);
/* perform seek operation */ /* perform seek operation */
if ((PHPDBG_G(flags) & PHPDBG_SEEK_MASK) && !(PHPDBG_G(flags) & PHPDBG_IN_EVAL)) { if ((PHPDBG_G(flags) & PHPDBG_SEEK_MASK) && !(PHPDBG_G(flags) & PHPDBG_IN_EVAL)) {
/* current address */ /* current address */
zend_ulong address = (zend_ulong) execute_data->opline; zend_ulong address = (zend_ulong) execute_data->opline;
if (PHPDBG_G(seek_ex) != execute_data) { if (PHPDBG_G(seek_ex) != execute_data) {
if (PHPDBG_G(flags) & PHPDBG_IS_STEPPING) {
goto stepping;
}
goto next; goto next;
} }
@ -1584,10 +1590,8 @@ ex_is_caught:
} }
} }
/* 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))) { 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; PHPDBG_G(flags) &= ~PHPDBG_IS_STEPPING;
DO_INTERACTIVE(1); DO_INTERACTIVE(1);
} }

37
sapi/phpdbg/tests/next_001.phpt Normal file
View file

@ -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;