FAST_RET opcode also returns

This commit is contained in:
Bob Weinand 2015-04-22 01:11:59 +02:00
parent e09a0bfc9e
commit 0ec3a6ff33

View File

@ -486,6 +486,7 @@ int phpdbg_skip_line_helper() /* {{{ */ {
while (++opline < op_array->opcodes + op_array->last) { while (++opline < op_array->opcodes + op_array->last) {
if (opline->lineno != EG(current_execute_data)->opline->lineno if (opline->lineno != EG(current_execute_data)->opline->lineno
|| opline->opcode == ZEND_RETURN || opline->opcode == ZEND_RETURN
|| opline->opcode == ZEND_FAST_RET
|| opline->opcode == ZEND_GENERATOR_RETURN || opline->opcode == ZEND_GENERATOR_RETURN
|| opline->opcode == ZEND_EXIT || opline->opcode == ZEND_EXIT
|| opline->opcode == ZEND_YIELD || opline->opcode == ZEND_YIELD
@ -529,6 +530,7 @@ static void phpdbg_seek_to_end(void) /* {{{ */ {
while (++opline < op_array->opcodes + op_array->last) { while (++opline < op_array->opcodes + op_array->last) {
switch (opline->opcode) { switch (opline->opcode) {
case ZEND_RETURN: case ZEND_RETURN:
case ZEND_FAST_RET:
case ZEND_GENERATOR_RETURN: case ZEND_GENERATOR_RETURN:
case ZEND_EXIT: case ZEND_EXIT:
case ZEND_YIELD: case ZEND_YIELD: