diff options
| -rw-r--r-- | Zend/zend_compile.c | 8 | ||||
| -rw-r--r-- | Zend/zend_vm_def.h | 7 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 32 | ||||
| -rw-r--r-- | Zend/zend_vm_opcodes.h | 1 |
4 files changed, 47 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 831f9f9d3f..f0802efd58 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2670,12 +2670,18 @@ void zend_do_yield(znode *expr TSRMLS_DC) /* {{{ */ void zend_do_suspend_if_generator(TSRMLS_D) /* {{{ */ { + zend_op *opline; + // we only suspend execution if the current function is a generator if ((CG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) == 0) { return; } - /* do nothing for now */ + opline = get_next_op(CG(active_op_array) TSRMLS_CC); + + opline->opcode = ZEND_SUSPEND_AND_RETURN_GENERATOR; + SET_UNUSED(opline->op1); + SET_UNUSED(opline->op2); } /* }}} */ diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 7b13b440fa..9dc7e0842c 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -5195,4 +5195,11 @@ ZEND_VM_HANDLER(156, ZEND_SEPARATE, VAR, UNUSED) ZEND_VM_NEXT_OPCODE(); } +ZEND_VM_HANDLER(159, ZEND_SUSPEND_AND_RETURN_GENERATOR, ANY, ANY) +{ + /* do nothing for now */ + + 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 2096c44e66..c6c3af65db 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1152,6 +1152,13 @@ static int ZEND_FASTCALL ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS } } +static int ZEND_FASTCALL ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) +{ + /* do nothing for now */ + + ZEND_VM_NEXT_OPCODE(); +} + static int ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE @@ -40782,6 +40789,31 @@ void zend_init_opcodes_handlers(void) ZEND_JMP_SET_VAR_SPEC_CV_HANDLER, ZEND_JMP_SET_VAR_SPEC_CV_HANDLER, ZEND_JMP_SET_VAR_SPEC_CV_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, + ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER, ZEND_NULL_HANDLER }; zend_opcode_handlers = (opcode_handler_t*)labels; diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h index 680778c2a2..9e24dee11d 100644 --- a/Zend/zend_vm_opcodes.h +++ b/Zend/zend_vm_opcodes.h @@ -159,3 +159,4 @@ #define ZEND_SEPARATE 156 #define ZEND_QM_ASSIGN_VAR 157 #define ZEND_JMP_SET_VAR 158 +#define ZEND_SUSPEND_AND_RETURN_GENERATOR 159 |