From 5c230baf75fb17d1d0b8ec407a7479d02b25068a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 19 Feb 2015 20:17:37 +0100 Subject: Implement Generator::getReturn() Conflicts: Zend/zend_vm_execute.h --- Zend/zend_opcode.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Zend/zend_opcode.c') diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index fbfadfa871..526f9e2952 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -798,11 +798,6 @@ ZEND_API int pass_two(zend_op_array *op_array) case ZEND_RETURN: case ZEND_RETURN_BY_REF: if (op_array->fn_flags & ZEND_ACC_GENERATOR) { - if (opline->op1_type != IS_CONST || Z_TYPE_P(RT_CONSTANT(op_array, opline->op1)) != IS_NULL) { - CG(zend_lineno) = opline->lineno; - zend_error_noreturn(E_COMPILE_ERROR, "Generators cannot return values using \"return\""); - } - opline->opcode = ZEND_GENERATOR_RETURN; } break; -- cgit v1.2.1