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_file_cache.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_file_cache.c')
| -rw-r--r-- | ext/opcache/zend_file_cache.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c index 54e2ab639a..0781b91c9d 100644 --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -386,6 +386,7 @@ static void zend_file_cache_serialize_op_array(zend_op_array *op_arra # if ZEND_USE_ABS_JMP_ADDR switch (opline->opcode) { case ZEND_JMP: + case ZEND_GOTO: case ZEND_FAST_CALL: case ZEND_DECLARE_ANON_CLASS: case ZEND_DECLARE_ANON_INHERITED_CLASS: @@ -458,11 +459,11 @@ static void zend_file_cache_serialize_op_array(zend_op_array *op_arra SERIALIZE_STR(op_array->function_name); SERIALIZE_STR(op_array->filename); + SERIALIZE_PTR(op_array->brk_cont_array); SERIALIZE_PTR(op_array->scope); SERIALIZE_STR(op_array->doc_comment); SERIALIZE_PTR(op_array->try_catch_array); SERIALIZE_PTR(op_array->prototype); - SERIALIZE_PTR(op_array->T_liveliness); } } @@ -912,6 +913,7 @@ static void zend_file_cache_unserialize_op_array(zend_op_array *op_arr # if ZEND_USE_ABS_JMP_ADDR switch (opline->opcode) { case ZEND_JMP: + case ZEND_GOTO: case ZEND_FAST_CALL: case ZEND_DECLARE_ANON_CLASS: case ZEND_DECLARE_ANON_INHERITED_CLASS: @@ -980,11 +982,11 @@ static void zend_file_cache_unserialize_op_array(zend_op_array *op_arr UNSERIALIZE_STR(op_array->function_name); UNSERIALIZE_STR(op_array->filename); + UNSERIALIZE_PTR(op_array->brk_cont_array); UNSERIALIZE_PTR(op_array->scope); UNSERIALIZE_STR(op_array->doc_comment); UNSERIALIZE_PTR(op_array->try_catch_array); UNSERIALIZE_PTR(op_array->prototype); - UNSERIALIZE_PTR(op_array->T_liveliness); } } |