From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 15 May 2019 08:07:51 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=139da4b2718076dee245cb17fc0a00bdcb0f177f;p=php

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.
---

139da4b2718076dee245cb17fc0a00bdcb0f177f
diff --cc Zend/zend_execute.h
index 4abdaca9fd,c3fee42f24..aa14a313aa
--- 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) \