diff options
| author | Anatol Belski <ab@php.net> | 2015-07-10 12:06:56 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-07-10 12:06:56 +0200 |
| commit | ad8a73dd55c087de465ad80e8715611693bb1460 (patch) | |
| tree | f76e6e2950a1e1cd958dab53e4100ab93c640938 /ext/opcache/zend_persist_calc.c | |
| parent | ceefc0947a12376eb6612376fd750744ac054f5c (diff) | |
| download | php-git-php-7.0.0beta1.tar.gz | |
Revert "Fixed bug #62210 (Exceptions can leak temporary variables. As a part of the fix serious refactoring was done. op_array->brk_cont_array was removed, and replaced with more general and speed efficient op_array->T_liveliness. ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time). (Bob, Dmitry, Laruence)"php-7.0.0beta1
This reverts commit 5ee841325901a4b040cfea56292a24702fe224d9.
Diffstat (limited to 'ext/opcache/zend_persist_calc.c')
| -rw-r--r-- | ext/opcache/zend_persist_calc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c index 9265ba5ce9..d78cc59259 100644 --- a/ext/opcache/zend_persist_calc.c +++ b/ext/opcache/zend_persist_calc.c @@ -229,6 +229,10 @@ static void zend_persist_op_array_calc_ex(zend_op_array *op_array) } } + if (op_array->brk_cont_array) { + ADD_DUP_SIZE(op_array->brk_cont_array, sizeof(zend_brk_cont_element) * op_array->last_brk_cont); + } + if (ZCG(accel_directives).save_comments && op_array->doc_comment) { ADD_STRING(op_array->doc_comment); } @@ -237,10 +241,6 @@ static void zend_persist_op_array_calc_ex(zend_op_array *op_array) ADD_DUP_SIZE(op_array->try_catch_array, sizeof(zend_try_catch_element) * op_array->last_try_catch); } - if (op_array->T_liveliness) { - ADD_DUP_SIZE(op_array->T_liveliness, sizeof(uint32_t) * op_array->T_liveliness[op_array->last]); - } - if (op_array->vars) { int i; |