diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-05-15 11:07:51 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-05-15 11:07:51 +0300 |
| commit | 139da4b2718076dee245cb17fc0a00bdcb0f177f (patch) | |
| tree | 6655244d85b48e0ca33861e4401d795934ded044 /Zend/zend_execute.c | |
| parent | a522fae382ba1774b69790270898344ce753327b (diff) | |
| parent | f9e801584701779e9035e1a21b815e30f6e59129 (diff) | |
| download | php-git-139da4b2718076dee245cb17fc0a00bdcb0f177f.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Removed ability to compile PHP without EX(run_time_cache). ZEND_EX_USE_RUN_TIME_CACHE was always defined.
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 67ef2d4bc0..10dd64a15d 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -3368,7 +3368,7 @@ static zend_always_inline void i_init_func_execute_data(zend_op_array *op_array, /* Initialize CV variables (skip arguments) */ zend_init_cvs(num_args, op_array->last_var EXECUTE_DATA_CC); - EX_LOAD_RUN_TIME_CACHE(op_array); + EX(run_time_cache) = RUN_TIME_CACHE(op_array); EG(current_execute_data) = execute_data; #if defined(ZEND_VM_IP_GLOBAL_REG) && ((ZEND_VM_KIND == ZEND_VM_KIND_CALL) || (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)) @@ -3444,7 +3444,7 @@ static zend_always_inline void i_init_code_execute_data(zend_execute_data *execu ZEND_MAP_PTR_SET(op_array->run_time_cache, ptr); memset(ptr, 0, op_array->cache_size); } - EX_LOAD_RUN_TIME_CACHE(op_array); + EX(run_time_cache) = RUN_TIME_CACHE(op_array); EG(current_execute_data) = execute_data; } |