com php-src: Initialize VAR_FLAGS for generators: Zen d/zend_vm_def.h Zend/zend_vm_execute.h

From: Date: Fri, 17 Apr 2015 19:51:49 +0000
Subject: com php-src: Initialize VAR_FLAGS for generators: Zen d/zend_vm_def.h Zend/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86360@lists.php.net to get a copy of this message
Commit: 38da85f31304a5682858d43c16f19cf4db149591 Author: Nikita Popov <nikic@php.net> Fri, 17 Apr 2015 21:50:36 +0200 Parents: cac2f7ebaa1b120cb324aab56a99fc9b6dd84095 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=38da85f31304a5682858d43c16f19cf4db149591 Log: Initialize VAR_FLAGS for generators Changed paths: M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 28bde46..fa1a187 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3469,7 +3469,9 @@ ZEND_VM_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY) EG(scope) = NULL; if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) { if (RETURN_VALUE_USED(opline)) { - zend_generator_create_zval(call, &fbc->op_array, EX_VAR(opline->result.var)); + ret = EX_VAR(opline->result.var); + zend_generator_create_zval(call, &fbc->op_array, ret); + Z_VAR_FLAGS_P(ret) = 0; } else { zend_vm_stack_free_args(call); } @@ -3592,7 +3594,9 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY) EG(scope) = fbc->common.scope; if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) { if (RETURN_VALUE_USED(opline)) { - zend_generator_create_zval(call, &fbc->op_array, EX_VAR(opline->result.var)); + ret = EX_VAR(opline->result.var); + zend_generator_create_zval(call, &fbc->op_array, ret); + Z_VAR_FLAGS_P(ret) = 0; } else { zend_vm_stack_free_args(call); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index c969a30..f991caf 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -626,7 +626,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER( EG(scope) = NULL; if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) { if (RETURN_VALUE_USED(opline)) { - zend_generator_create_zval(call, &fbc->op_array, EX_VAR(opline->result.var)); + ret = EX_VAR(opline->result.var); + zend_generator_create_zval(call, &fbc->op_array, ret); + Z_VAR_FLAGS_P(ret) = 0; } else { zend_vm_stack_free_args(call); } @@ -749,7 +751,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPC EG(scope) = fbc->common.scope; if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) { if (RETURN_VALUE_USED(opline)) { - zend_generator_create_zval(call, &fbc->op_array, EX_VAR(opline->result.var)); + ret = EX_VAR(opline->result.var); + zend_generator_create_zval(call, &fbc->op_array, ret); + Z_VAR_FLAGS_P(ret) = 0; } else { zend_vm_stack_free_args(call); }

« previous php.cvs (#86360) next »