com php-src: Merge branch 'PHP-7.4': Zend/zend_compile.h Zend/zend_execute.c Zend/zend_execute.h
| From: | Dmitry Stogov | Date: | Wed, 15 May 2019 08:07:51 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': Zend/zend_compile.h Zend/zend_execute.c Zend/zend_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106200@lists.php.net to get a copy of this message | ||
Commit: 139da4b2718076dee245cb17fc0a00bdcb0f177f
Author: Dmitry Stogov <dmitry@zend.com> Wed, 15 May 2019 11:07:51 +0300
Parents: a522fae382ba1774b69790270898344ce753327b f9e801584701779e9035e1a21b815e30f6e59129
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=139da4b2718076dee245cb17fc0a00bdcb0f177f
Log:
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..
Changed paths:
MM Zend/zend_compile.h
MM Zend/zend_execute..c
MM Zend/zend_execute.h
Diff:
diff --cc Zend/zend_execute.h
index 4abdaca,c3fee42..aa14a31
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@@ -362,14 -362,16 +362,14 @@@ ZEND_API void zend_clean_and_cache_symb
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);
-ZEND_API int ZEND_FASTCALL zend_do_fcall_overloaded(zend_execute_data *call, zval *ret);
-
#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) \