Use EX(run_time_cache) instead of RUN_TIME_CACHE(&EX(func)->op_array)

Author: dstogov

ext/opcache/jit/zend_jit_vm_helpers.c

@@ -184,9 +184,7 @@ ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_profile_helper(ZEND_OPCODE_HANDLE
 	zend_op_array *op_array = (zend_op_array*)EX(func);
 	zend_jit_op_array_extension *jit_extension = (zend_jit_op_array_extension*)ZEND_FUNC_INFO(op_array);
 	zend_vm_opcode_handler_t handler = jit_extension->orig_handler;
-	uintptr_t counter = (uintptr_t)ZEND_COUNTER_INFO(op_array);
-
-	ZEND_COUNTER_INFO(op_array) = (void*)(counter + 1);
+	++*(uintptr_t*)(EX(run_time_cache) + zend_jit_profile_counter_rid);
 	++zend_jit_profile_counter;
 	ZEND_OPCODE_TAIL_CALL(handler);
 }

ext/opcache/jit/zend_jit_x86.dasc

@@ -2156,26 +2156,14 @@ static int zend_jit_hybrid_profile_jit_stub(dasm_State **Dst)
 	|	.endif
 	|	// op_array = (zend_op_array*)EX(func);
 	|	mov r0, EX->func
-	|	// ++ZEND_COUNTER_INFO(op_array)
-	|	mov r2, aword [r0 + offsetof(zend_op_array, run_time_cache__ptr)]
-#if ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR
-	|	mov r2, aword [r2]
-#elif ZEND_MAP_PTR_KIND == ZEND_MAP_PTR_KIND_PTR_OR_OFFSET
-	|	test r2, 1
-	|	jz >1
-	|	MEM_OP2_2_ZTS add, r2, aword, compiler_globals, map_ptr_base, r1
-	|1:
-	|	mov r2, aword [r2]
-#else
-# error "Unknown ZEND_MAP_PTR_KIND"
-#endif
-	|	inc aword [r2 + zend_jit_profile_counter_rid * sizeof(void*)]
+	|	// run_time_cache = EX(run_time_cache);
+	|	mov r2, EX->run_time_cache
 	|	// jit_extension = (const void*)ZEND_FUNC_INFO(op_array);
 	|	mov r0, aword [r0 + offsetof(zend_op_array, reserved[zend_func_info_rid])]
-	|	// handler = jit_extension->orig_handler
-	|	mov r0, aword [r0 + offsetof(zend_jit_op_array_extension, orig_handler)]
-	|	// return ((zend_vm_opcode_handler_t)handler)();
-	|	jmp r0
+	|	// ++ZEND_COUNTER_INFO(op_array)
+	|	inc aword [r2 + zend_jit_profile_counter_rid * sizeof(void*)]
+	|	// return ((zend_vm_opcode_handler_t)jit_extension->orig_handler)()
+	|	jmp aword [r0 + offsetof(zend_jit_op_array_extension, orig_handler)]
 	return 1;
 }