From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 4 Jun 2019 14:14:26 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18060e592373f350a96d205dc4d002206dc4fcb7;p=php

Merge branch 'PHP-7.3' into PHP-7.4
---

18060e592373f350a96d205dc4d002206dc4fcb7
diff --cc TSRM/TSRM.h
index 3af42d9b67,ad18012f3d..3e3e7d656e
--- a/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 */