Simplify the jit patch

Author: shivammathur

ext/opcache/jit/tls/zend_jit_tls_darwin.c

@@ -26,16 +26,11 @@
 
 TSRMLS_CACHE_EXTERN();
 
-struct TLSDescriptor {
-	void *(*thunk)(struct TLSDescriptor *);
+typedef struct _tls_descriptor {
+	void *(*thunk)(struct _tls_descriptor *);
 	uintptr_t key;
 	uintptr_t offset;
-};
-
-#if defined(__x86_64__)
-static void *(*zend_jit_darwin_tls_thunk)(struct TLSDescriptor *);
-static struct TLSDescriptor *zend_jit_darwin_tls_desc;
-#endif
+} tls_descriptor;
 
 zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
 	size_t *tcb_offset,
@@ -48,39 +43,15 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
 	}
 
 #if defined(__x86_64__)
-	const struct TLSDescriptor *desc;
-	__asm__ __volatile__(
-		"leaq __tsrm_ls_cache@TLVP(%%rip), %0\n\t"
-		"movq (%0), %0"
-		: "=&r" (desc)
-		:
-		: "memory"
-	);
-
-	zend_jit_darwin_tls_thunk = desc->thunk;
-	zend_jit_darwin_tls_desc  = (struct TLSDescriptor *)desc;
-
-	*tcb_offset   = 0;
-	*module_index = (size_t)-1;
+	*module_index  = (size_t)-1;
 	*module_offset = (size_t)-1;
-
+	*tcb_offset = 0;
 	return SUCCESS;
 #endif
 
 	return FAILURE;
 }
 
-ZEND_API void *zend_jit_tsrm_ls_cache_ptr(void)
-{
-#if defined(__x86_64__)
-	return zend_jit_darwin_tls_thunk
-		? zend_jit_darwin_tls_thunk(zend_jit_darwin_tls_desc)
-		: NULL;
-#else
-	return NULL;
-#endif
-}
-
 /* Used for testing */
 void *zend_jit_tsrm_ls_cache_address(
 	size_t tcb_offset,
@@ -99,9 +70,15 @@ void *zend_jit_tsrm_ls_cache_address(
 		return addr;
 	}
 	if (module_index == (size_t)-1 && module_offset == (size_t)-1) {
-		return zend_jit_darwin_tls_thunk
-			? zend_jit_darwin_tls_thunk(zend_jit_darwin_tls_desc)
-			: NULL;
+		const tls_descriptor *tlsdesc;
+		__asm__ __volatile__(
+			"leaq __tsrm_ls_cache@TLVP(%%rip), %0\n\t"
+			"movq (%0), %0"
+			: "=&r" (tlsdesc)
+			:
+			: "memory"
+		);
+		return tlsdesc->thunk((tls_descriptor *)tlsdesc);
 	}
 	if (module_index != (size_t)-1 && module_offset != (size_t)-1) {
 		char *base;