Merge branch 'PHP-7.3' into PHP-7.4

diff --cc TSRM/TSRM.h
index 3af42d9b6775bf5e70e1515ae46f1d27bb443ad9,ad18012f3d98a35f36c29f4cf40652f425adc594..3e3e7d656e4844a0e90c6bfb8875c28bd66f92c1
--- 1/TSRM/TSRM.h
--- 2/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@@ -181,17 -165,9 +181,11 @@@ TSRM_API const char *tsrm_api_name(void
  
  #define TSRMG_STATIC(id, type, element)       (TSRMG_BULK_STATIC(id, type)->element)
  #define TSRMG_BULK_STATIC(id, type)   ((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
 +#define TSRMG_FAST_STATIC(offset, type, element)      (TSRMG_FAST_BULK_STATIC(offset, type)->element)
 +#define TSRMG_FAST_BULK_STATIC(offset, type)  ((type) (((char*) TSRMLS_CACHE)+(offset)))
  #define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
  #define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
- #if ZEND_DEBUG
  #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
- #define TSRMLS_CACHE_RESET()
- #else
- #define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
- #define TSRMLS_CACHE_RESET()  TSRMLS_CACHE = NULL
- #endif
  #define TSRMLS_CACHE _tsrm_ls_cache
  
  /* BC only */

diff --cc sapi/embed/php_embed.c
Simple merge