From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 29 Jun 2015 00:05:33 +0000 (+0200)
Subject: Add yield from to frame leaving instructions
X-Git-Tag: php-7.1.0alpha3~25^2~137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f500471e8c27af61e3c213d183e583b49d8b42ee;p=php

Add yield from to frame leaving instructions
---

diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index fc63c32fa3..71de3a2f7b 100644
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@ -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;
 		}