]> granicus.if.org Git - php/commitdiff
Add yield from to frame leaving instructions
authorBob Weinand <bobwei9@hotmail.com>
Mon, 29 Jun 2015 00:05:33 +0000 (02:05 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Mon, 29 Jun 2015 00:05:33 +0000 (02:05 +0200)
sapi/phpdbg/phpdbg_prompt.c

index fc63c32fa3cfdcab1279848a94ee213e0ec64e38..71de3a2f7bd99eb2c490590b4d1be31f0a118e51 100644 (file)
@@ -493,6 +493,7 @@ int phpdbg_skip_line_helper() /* {{{ */ {
                         || opline->opcode == ZEND_GENERATOR_RETURN
                         || opline->opcode == ZEND_EXIT
                         || opline->opcode == ZEND_YIELD
+                        || opline->opcode == ZEND_YIELD_FROM
                        ) {
                                zend_hash_index_update_ptr(&PHPDBG_G(seek), (zend_ulong) opline, (void *) opline);
                                break;
@@ -537,6 +538,7 @@ static void phpdbg_seek_to_end(void) /* {{{ */ {
                        case ZEND_GENERATOR_RETURN:
                        case ZEND_EXIT:
                        case ZEND_YIELD:
+                       case ZEND_YIELD_FROM:
                                zend_hash_index_update_ptr(&PHPDBG_G(seek), (zend_ulong) opline, (void *) opline);
                                return;
                }