diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-03-03 16:13:03 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-03-03 16:13:03 +0300 |
| commit | a07272e5b63b404ff7070637137e81634a886bd8 (patch) | |
| tree | a8715a8525cac3e2959c68491bd340c00773495c | |
| parent | 9276eb613c06331b9e3dfc90fcf3c30ca91d4b33 (diff) | |
| parent | 6158b517c437e2b49f50a6807267c200492e6b74 (diff) | |
| download | php-git-a07272e5b63b404ff7070637137e81634a886bd8.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt)
| -rw-r--r-- | ext/opcache/zend_file_cache.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c index 2d5ebe6865..8747ac3787 100644 --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -359,6 +359,25 @@ static void zend_file_cache_serialize_op_array(zend_op_array *op_arra zend_file_cache_serialize_hash(ht, script, info, buf, zend_file_cache_serialize_zval); } + if (op_array->scope && !IS_SERIALIZED(op_array->opcodes)) { + if (UNEXPECTED(zend_shared_alloc_get_xlat_entry(op_array->opcodes))) { + op_array->refcount = (uint32_t*)(intptr_t)-1; + SERIALIZE_PTR(op_array->literals); + SERIALIZE_PTR(op_array->opcodes); + SERIALIZE_PTR(op_array->arg_info); + SERIALIZE_PTR(op_array->vars); + SERIALIZE_STR(op_array->function_name); + SERIALIZE_STR(op_array->filename); + SERIALIZE_PTR(op_array->live_range); + SERIALIZE_PTR(op_array->scope); + SERIALIZE_STR(op_array->doc_comment); + SERIALIZE_PTR(op_array->try_catch_array); + SERIALIZE_PTR(op_array->prototype); + return; + } + zend_shared_alloc_register_xlat_entry(op_array->opcodes, op_array->opcodes); + } + if (op_array->literals && !IS_SERIALIZED(op_array->literals)) { zval *p, *end; @@ -944,6 +963,22 @@ static void zend_file_cache_unserialize_op_array(zend_op_array *op_arr script, buf, zend_file_cache_unserialize_zval, ZVAL_PTR_DTOR); } + if (op_array->refcount) { + op_array->refcount = NULL; + UNSERIALIZE_PTR(op_array->literals); + UNSERIALIZE_PTR(op_array->opcodes); + UNSERIALIZE_PTR(op_array->arg_info); + UNSERIALIZE_PTR(op_array->vars); + UNSERIALIZE_STR(op_array->function_name); + UNSERIALIZE_STR(op_array->filename); + UNSERIALIZE_PTR(op_array->live_range); + UNSERIALIZE_PTR(op_array->scope); + UNSERIALIZE_STR(op_array->doc_comment); + UNSERIALIZE_PTR(op_array->try_catch_array); + UNSERIALIZE_PTR(op_array->prototype); + return; + } + if (op_array->literals && !IS_UNSERIALIZED(op_array->literals)) { zval *p, *end; |