Small generator-related cleanups

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 4bb712678f964dc95cd3333e1cce59282a1e54d6..9ebe966f1682463481af8d08c0e213a747bc1602 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -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 &&

diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 0b5fe75ff8b06619ee57d2a525bdc626b03ec792..91787aaad7cbfa00e0c02219bde282c0d24fd3ca 100644 (file)
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -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) {