From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 28 Nov 2016 09:30:01 +0000 (+0300)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=458c732ed4fae4d174da727e6dadf8e014e3c93d;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed calling generators through magic __call()
---

458c732ed4fae4d174da727e6dadf8e014e3c93d
diff --cc Zend/zend_vm_def.h
index 6e82ddba8f,fdce0f973f..0f1d754f8c
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -7964,18 -7927,28 +7964,15 @@@ ZEND_VM_HANDLER(158, ZEND_CALL_TRAMPOLI
  	fbc = call->func;
  
  	if (EXPECTED(fbc->type == ZEND_USER_FUNCTION)) {
- 
- 		ZEND_ASSERT(!(fbc->common.fn_flags & ZEND_ACC_GENERATOR));
--
 -		if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) {
 -			if (ret) {
 -				zend_generator_create_zval(call, &fbc->op_array, ret);
 -				Z_VAR_FLAGS_P(ret) = 0;
 -			} else {
 -				if (UNEXPECTED(ZEND_CALL_INFO(call) & ZEND_CALL_CLOSURE)) {
 -					OBJ_RELEASE((zend_object*)fbc->op_array.prototype);
 -				}
 -				zend_vm_stack_free_args(call);
 -			}
 +		if (UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +			init_func_run_time_cache(&fbc->op_array);
 +		}
 +		i_init_func_execute_data(call, &fbc->op_array, ret);
 +		if (EXPECTED(zend_execute_ex == execute_ex)) {
 +			ZEND_VM_ENTER();
  		} else {
 -			call->symbol_table = NULL;
 -			i_init_func_execute_data(call, &fbc->op_array,
 -					ret, (fbc->common.fn_flags & ZEND_ACC_STATIC) == 0);
 -
 -			if (EXPECTED(zend_execute_ex == execute_ex)) {
 -				ZEND_VM_ENTER();
 -			} else {
 -				ZEND_ADD_CALL_FLAG(call, ZEND_CALL_TOP);
 -				zend_execute_ex(call);
 -			}
 +			ZEND_ADD_CALL_FLAG(call, ZEND_CALL_TOP);
 +			zend_execute_ex(call);
  		}
  	} else {
  		zval retval;
diff --cc Zend/zend_vm_execute.h
index fc1b7f571d,c97525e0f4..cb49393dd3
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -1976,18 -1736,28 +1976,15 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  	fbc = call->func;
  
  	if (EXPECTED(fbc->type == ZEND_USER_FUNCTION)) {
- 
- 		ZEND_ASSERT(!(fbc->common.fn_flags & ZEND_ACC_GENERATOR));
--
 -		if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) {
 -			if (ret) {
 -				zend_generator_create_zval(call, &fbc->op_array, ret);
 -				Z_VAR_FLAGS_P(ret) = 0;
 -			} else {
 -				if (UNEXPECTED(ZEND_CALL_INFO(call) & ZEND_CALL_CLOSURE)) {
 -					OBJ_RELEASE((zend_object*)fbc->op_array.prototype);
 -				}
 -				zend_vm_stack_free_args(call);
 -			}
 +		if (UNEXPECTED(!fbc->op_array.run_time_cache)) {
 +			init_func_run_time_cache(&fbc->op_array);
 +		}
 +		i_init_func_execute_data(call, &fbc->op_array, ret);
 +		if (EXPECTED(zend_execute_ex == execute_ex)) {
 +			ZEND_VM_ENTER();
  		} else {
 -			call->symbol_table = NULL;
 -			i_init_func_execute_data(call, &fbc->op_array,
 -					ret, (fbc->common.fn_flags & ZEND_ACC_STATIC) == 0);
 -
 -			if (EXPECTED(zend_execute_ex == execute_ex)) {
 -				ZEND_VM_ENTER();
 -			} else {
 -				ZEND_ADD_CALL_FLAG(call, ZEND_CALL_TOP);
 -				zend_execute_ex(call);
 -			}
 +			ZEND_ADD_CALL_FLAG(call, ZEND_CALL_TOP);
 +			zend_execute_ex(call);
  		}
  	} else {
  		zval retval;