revert the local speedup approach

TSRM/TSRM.h

@@ -160,13 +160,10 @@ TSRM_API inline void *tsrm_get_ls_cache(void);
 #define TSRM_SHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)+1)
 #define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)-1)
 
-#define TSRMLS_FETCH()			           void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL)
-#define TSRMLS_FETCH_FROM_CTX(ctx)	       void ***tsrm_ls = (void ***) ctx
-#define TSRMLS_SET_CTX(ctx)		           ctx = (void ***) tsrm_get_ls_cache()
-#define TSRMX(name)                        tsrm_ls_cache_##name
-#define TSRMX_D(name)                      static void*** TSRMX(name)
-#define TSRMGX(cache, id, type, element)   (((type) (*((void ***) cache))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
-#define TSRMG(id, type, element)	       TSRMGX(tsrm_get_ls_cache(), id, type, element)
+#define TSRMLS_FETCH()			void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL)
+#define TSRMLS_FETCH_FROM_CTX(ctx)	void ***tsrm_ls = (void ***) ctx
+#define TSRMLS_SET_CTX(ctx)		ctx = (void ***) tsrm_get_ls_cache()
+#define TSRMG(id, type, element)	(((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
 #define TSRMLS_D
 #define TSRMLS_DC
 #define TSRMLS_C	

Zend/zend_alloc.c

@@ -2007,8 +2007,7 @@ typedef struct _zend_alloc_globals {
 
 #ifdef ZTS
 static int alloc_globals_id;
-TSRMX_D(alloc);
-# define AG(v) TSRMGX(TSRMX(alloc), alloc_globals_id, zend_alloc_globals *, v)
+# define AG(v) TSRMG(alloc_globals_id, zend_alloc_globals *, v)
 #else
 # define AG(v) (alloc_globals.v)
 static zend_alloc_globals alloc_globals;
@@ -2312,9 +2311,7 @@ static void alloc_globals_dtor(zend_alloc_globals *alloc_globals TSRMLS_DC)
 ZEND_API void start_memory_manager(TSRMLS_D)
 {
 #ifdef ZTS
-	ts_allocate_id
-	    (&alloc_globals_id, sizeof(zend_alloc_globals), (ts_allocate_ctor) alloc_globals_ctor, (ts_allocate_dtor) alloc_globals_dtor);
-	TSRMX(alloc) = tsrm_get_ls_cache();
+	ts_allocate_id(&alloc_globals_id, sizeof(zend_alloc_globals), (ts_allocate_ctor) alloc_globals_ctor, (ts_allocate_dtor) alloc_globals_dtor);
 #else
 	alloc_globals_ctor(&alloc_globals);
 #endif

Zend/zend_ini.c

@@ -169,7 +169,6 @@ ZEND_API int zend_copy_ini_directives(TSRMLS_D) /* {{{ */
 	EG(ini_directives) = (HashTable *) malloc(sizeof(HashTable));
 	zend_hash_init_ex(EG(ini_directives), registered_zend_ini_directives->nNumOfElements, NULL, free_ini_entry, 1, 0);
 	zend_hash_copy(EG(ini_directives), registered_zend_ini_directives, copy_ini_entry);
-
 	return SUCCESS;
 }
 /* }}} */