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

Small generator-related cleanups

Browse source
This commit is contained in:
Nikita Popov 2016-06-04 12:59:35 +02:00
parent b7bb6d04fd
commit cb3825a8dc
2 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Zend/zend_compile.c
View file

@ -3183,11 +3183,7 @@ ZEND_API zend_uchar zend_get_call_op(const zend_op *init_op, zend_function *fbc)
}
} else {
if (zend_execute_ex == execute_ex) {
if (!(fbc->common.fn_flags & ZEND_ACC_GENERATOR)) {
return ZEND_DO_UCALL;
} else {
return ZEND_DO_FCALL_BY_NAME;
}
return ZEND_DO_UCALL;
}
}
} else if (zend_execute_ex == execute_ex &&

13
Zend/zend_opcode.c
View file

@ -642,19 +642,6 @@ ZEND_API int pass_two(zend_op_array *op_array)
/* absolute index to relative offset */
opline->extended_value = ZEND_OPLINE_NUM_TO_OFFSET(op_array, opline, opline->extended_value);
break;
case ZEND_VERIFY_RETURN_TYPE:
if (op_array->fn_flags & ZEND_ACC_GENERATOR) {
if (opline->op1_type != IS_UNUSED) {
zend_op *ret = opline;
do ret++; while (ret->opcode != ZEND_RETURN);
ret->op1 = opline->op1;
ret->op1_type = opline->op1_type;
}
MAKE_NOP(opline);
}
break;
case ZEND_RETURN:
case ZEND_RETURN_BY_REF:
if (op_array->fn_flags & ZEND_ACC_GENERATOR) {