Remove implementation stubs for yield delegation

I decided to leave out yield delegation for an initial proposal, so remove
the stubs for it too.

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 563069118e43f5c4baa5ff880eda542cb395e7ab..d4201059b2e72a2c3b5793c18ed820a9ff8a6744 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2702,29 +2702,6 @@ void zend_do_yield(znode *result, znode *value, const znode *key, zend_bool is_v
 }
 /* }}} */
 
-void zend_do_delegate_yield(znode *result, const znode *value TSRMLS_DC) /* {{{ */
-{
-       zend_op *opline;
-
-       if (!CG(active_op_array)->function_name) {
-               zend_error(E_COMPILE_ERROR, "The \"yield*\" expression can only be used inside a function");
-       }
-
-       CG(active_op_array)->fn_flags |= ZEND_ACC_GENERATOR;
-
-       opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-
-       opline->opcode = ZEND_DELEGATE_YIELD;
-
-       SET_NODE(opline->op1, value);
-       SET_UNUSED(opline->op2);
-
-       opline->result_type = IS_VAR;
-       opline->result.var = get_temporary_variable(CG(active_op_array));
-       GET_NODE(result, opline->result);
-}
-/* }}} */
-
 static int zend_add_try_element(zend_uint try_op TSRMLS_DC) /* {{{ */
 {
        int try_catch_offset = CG(active_op_array)->last_try_catch++;

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index acff761f88a01f921971a602c0dd19b74b145e14..42f3ed405d47551bb5df3adfd79a8ef77742ac81 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -496,7 +496,6 @@ int zend_do_begin_class_member_function_call(znode *class_name, znode *method_na
 void zend_do_end_function_call(znode *function_name, znode *result, const znode *argument_list, int is_method, int is_dynamic_fcall TSRMLS_DC);
 void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC);
 void zend_do_yield(znode *result, znode *value, const znode *key, zend_bool is_variable TSRMLS_DC);
-void zend_do_delegate_yield(znode *result, const znode *value TSRMLS_DC);
 void zend_do_handle_exception(TSRMLS_D);
 
 void zend_do_begin_lambda_function_declaration(znode *result, znode *function_token, int return_reference, int is_static TSRMLS_DC);

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 29012b769ba72107d06c68f89dca199f2f7a112b..8b0f500895bcaeb405d3412a817502e64b7a3a21 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -807,9 +807,6 @@ expr_without_variable:
        |       '`' backticks_expr '`' { zend_do_shell_exec(&$$, &$2 TSRMLS_CC); }
        |       T_PRINT expr  { zend_do_print(&$$, &$2 TSRMLS_CC); }
        |       T_YIELD { zend_do_yield(&$$, NULL, NULL, 0 TSRMLS_CC); }
-       /*|     T_YIELD expr_without_variable { zend_do_yield(&$$, &$2, NULL, 0 TSRMLS_CC); }
-       |       T_YIELD variable { zend_do_yield(&$$, &$2, NULL, 1 TSRMLS_CC); }*/
-       |       T_YIELD '*' expr { zend_do_delegate_yield(&$$, &$3 TSRMLS_CC); }
        |       function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); }
                '(' parameter_list ')' lexical_vars
                '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); $$ = $3; }

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 19031bc18dd5b61007b6344b9144c12220bf0331..101667957be9d85508f0ca3fa0b9c350fbfd32cd 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3055,7 +3055,7 @@ ZEND_VM_HANDLER(111, ZEND_RETURN_BY_REF, CONST|TMP|VAR|CV, ANY)
        ZEND_VM_DISPATCH_TO_HELPER(zend_leave_helper);
 }
 
-ZEND_VM_HANDLER(162, ZEND_GENERATOR_RETURN, ANY, ANY)
+ZEND_VM_HANDLER(161, ZEND_GENERATOR_RETURN, ANY, ANY)
 {
        if (EX(op_array)->has_finally_block) {
                ZEND_VM_DISPATCH_TO_HELPER_EX(zend_finally_handler_leaving, type, ZEND_RETURN);
@@ -5552,9 +5552,4 @@ ZEND_VM_HANDLER(160, ZEND_YIELD, CONST|TMP|VAR|CV|UNUSED, CONST|TMP|VAR|CV|UNUSE
        ZEND_VM_RETURN();
 }
 
-ZEND_VM_HANDLER(161, ZEND_DELEGATE_YIELD, CONST|TMP|VAR|CV, ANY)
-{
-       ZEND_VM_NEXT_OPCODE();
-}
-
 ZEND_VM_EXPORT_HELPER(zend_do_fcall, zend_do_fcall_common_helper)

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 6a5e2fff1202e29b7cc0d90514f4f5b9c41882cd..a6439674d5c2b441fba7553eb0150b1f29978a46 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -3177,11 +3177,6 @@ static int ZEND_FASTCALL  ZEND_QM_ASSIGN_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND
        ZEND_VM_NEXT_OPCODE();
 }
 
-static int ZEND_FASTCALL  ZEND_DELEGATE_YIELD_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       ZEND_VM_NEXT_OPCODE();
-}
-
 static int ZEND_FASTCALL  ZEND_ADD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
@@ -8556,11 +8551,6 @@ static int ZEND_FASTCALL  ZEND_INSTANCEOF_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_A
        ZEND_VM_NEXT_OPCODE();
 }
 
-static int ZEND_FASTCALL  ZEND_DELEGATE_YIELD_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       ZEND_VM_NEXT_OPCODE();
-}
-
 static int ZEND_FASTCALL  ZEND_ADD_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
@@ -14014,11 +14004,6 @@ static int ZEND_FASTCALL  ZEND_INSTANCEOF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_A
        ZEND_VM_NEXT_OPCODE();
 }
 
-static int ZEND_FASTCALL  ZEND_DELEGATE_YIELD_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       ZEND_VM_NEXT_OPCODE();
-}
-
 static int ZEND_FASTCALL  ZEND_ADD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
@@ -31430,11 +31415,6 @@ static int ZEND_FASTCALL  ZEND_INSTANCEOF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_AR
        ZEND_VM_NEXT_OPCODE();
 }
 
-static int ZEND_FASTCALL  ZEND_DELEGATE_YIELD_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       ZEND_VM_NEXT_OPCODE();
-}
-
 static int ZEND_FASTCALL  ZEND_ADD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
@@ -45025,31 +45005,6 @@ void zend_init_opcodes_handlers(void)
        ZEND_YIELD_SPEC_CV_VAR_HANDLER,
        ZEND_YIELD_SPEC_CV_UNUSED_HANDLER,
        ZEND_YIELD_SPEC_CV_CV_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_CONST_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_CONST_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_CONST_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_CONST_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_CONST_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_TMP_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_TMP_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_TMP_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_TMP_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_TMP_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_VAR_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_VAR_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_VAR_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_VAR_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_VAR_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_CV_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_CV_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_CV_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_CV_HANDLER,
-       ZEND_DELEGATE_YIELD_SPEC_CV_HANDLER,
        ZEND_GENERATOR_RETURN_SPEC_HANDLER,
        ZEND_GENERATOR_RETURN_SPEC_HANDLER,
        ZEND_GENERATOR_RETURN_SPEC_HANDLER,

diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h
index 0b4903ac3651a4529b302eb5b7db91763b98803d..7f9434995483e772fe889dc4db660978f06204b7 100644 (file)
--- a/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@ -161,5 +161,4 @@
 #define ZEND_JMP_SET_VAR                     158
 #define ZEND_LEAVE                           159
 #define ZEND_YIELD                           160
-#define ZEND_DELEGATE_YIELD                  161
-#define ZEND_GENERATOR_RETURN                162
+#define ZEND_GENERATOR_RETURN                161