archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix bug using not set temporary with typed generator returns

Browse source
This commit is contained in:
Bob Weinand 2015-07-24 20:30:32 +02:00
parent 352bf686ce
commit 2eb845d0fa
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Zend/tests/generators/generator_return_return_type.phpt Normal file
View file

@ -0,0 +1,17 @@
--TEST--
Generators must return a valid variable with return type specified
--FILE--
<?php
$gen = (function (): Generator {
return true;
yield;
})();
var_dump($gen->valid());
var_dump($gen->getReturn());
?>
--EXPECT--
bool(false)
bool(true)

6
Zend/zend_opcode.c
View file

@ -583,7 +583,7 @@ static void zend_resolve_finally_call(zend_op_array *op_array, uint32_t op_num,
fast_call_var = op_array->opcodes[op_array->try_catch_array[i].finally_end].op1.var;
/* generate a FAST_CALL to finally block */
start_op = get_next_op_number(op_array);
start_op = get_next_op_number(op_array);
opline = get_next_op(op_array);
opline->opcode = ZEND_FAST_CALL;
@ -807,6 +807,10 @@ ZEND_API int pass_two(zend_op_array *op_array)
break;
case ZEND_VERIFY_RETURN_TYPE:
if (op_array->fn_flags & ZEND_ACC_GENERATOR) {
if (opline->op1_type != IS_UNUSED) {
(opline + 1)->op1 = opline->op1;
(opline + 1)->op1_type = opline->op1_type;
}
MAKE_NOP(opline);
}
break;