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.h | |
| 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.h')
| -rw-r--r-- | Zend/zend_execute.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 4abdaca9fd..aa14a313aa 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -363,22 +363,22 @@ ZEND_API void zend_free_compiled_variables(zend_execute_data *execute_data); ZEND_API void zend_cleanup_unfinished_execution(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num); #define CACHE_ADDR(num) \ - ((void**)((char*)EX_RUN_TIME_CACHE() + (num))) + ((void**)((char*)EX(run_time_cache) + (num))) #define CACHED_PTR(num) \ - ((void**)((char*)EX_RUN_TIME_CACHE() + (num)))[0] + ((void**)((char*)EX(run_time_cache) + (num)))[0] #define CACHE_PTR(num, ptr) do { \ - ((void**)((char*)EX_RUN_TIME_CACHE() + (num)))[0] = (ptr); \ + ((void**)((char*)EX(run_time_cache) + (num)))[0] = (ptr); \ } while (0) #define CACHED_POLYMORPHIC_PTR(num, ce) \ - (EXPECTED(((void**)((char*)EX_RUN_TIME_CACHE() + (num)))[0] == (void*)(ce)) ? \ - ((void**)((char*)EX_RUN_TIME_CACHE() + (num)))[1] : \ + (EXPECTED(((void**)((char*)EX(run_time_cache) + (num)))[0] == (void*)(ce)) ? \ + ((void**)((char*)EX(run_time_cache) + (num)))[1] : \ NULL) #define CACHE_POLYMORPHIC_PTR(num, ce, ptr) do { \ - void **slot = (void**)((char*)EX_RUN_TIME_CACHE() + (num)); \ + void **slot = (void**)((char*)EX(run_time_cache) + (num)); \ slot[0] = (ce); \ slot[1] = (ptr); \ } while (0) |