Change parameter meaning.

diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
index 96d0be4230b0c068a46e82fd2f2ec2dac32cf2c7..5f7d12c1166f984936543ba58f26f2a8f8af8dc5 100644 (file)
--- a/ext/opcache/jit/zend_jit.c
+++ b/ext/opcache/jit/zend_jit.c
@@ -245,7 +245,7 @@ static void *dasm_link_and_encode(dasm_State             **dasm_state,
                                   const zend_op           *rt_opline,
                                   zend_lifetime_interval **ra,
                                   const char              *name,
-                                  zend_bool                is_trace)
+                                  uint32_t                 trace_num)
 {
        size_t size;
        int ret;
@@ -314,7 +314,7 @@ static void *dasm_link_and_encode(dasm_State             **dasm_state,
        entry = *dasm_ptr;
        *dasm_ptr = (void*)((char*)*dasm_ptr + ZEND_MM_ALIGNED_SIZE_EX(size, DASM_ALIGNMENT));
 
-       if (is_trace) {
+       if (trace_num) {
                zend_jit_trace_add_code(entry, size);
        }
 
@@ -368,7 +368,7 @@ static void *dasm_link_and_encode(dasm_State             **dasm_state,
        } else {
            if (ZCG(accel_directives).jit_debug & (ZEND_JIT_DEBUG_ASM_STUBS|ZEND_JIT_DEBUG_ASM)) {
                        zend_jit_disasm_add_symbol(name, (uintptr_t)entry, size);
-                   if (is_trace || (ZCG(accel_directives).jit_debug & ZEND_JIT_DEBUG_ASM_STUBS) != 0) {
+                       if (trace_num || (ZCG(accel_directives).jit_debug & ZEND_JIT_DEBUG_ASM_STUBS) != 0) {
                                zend_jit_disasm(
                                        name,
                                        (op_array && op_array->filename) ? ZSTR_VAL(op_array->filename) : NULL,

diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index 5523ecacbd654b9d3947442bfc56898133760dc3..ac51f9673e1ece55f35f7caa12315bb72ea448a8 100644 (file)
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -4014,7 +4014,7 @@ done:
                goto jit_failure;
        }
 
-       handler = dasm_link_and_encode(&dasm_state, NULL, NULL, NULL, NULL, ZSTR_VAL(name), 1);
+       handler = dasm_link_and_encode(&dasm_state, NULL, NULL, NULL, NULL, ZSTR_VAL(name), ZEND_JIT_TRACE_NUM);
 
 jit_failure:
        dasm_free(&dasm_state);
@@ -4106,7 +4106,7 @@ static const void *zend_jit_trace_exit_to_vm(uint32_t trace_num, uint32_t exit_n
 
        zend_jit_trace_return(&dasm_state, original_handler);
 
-       handler = dasm_link_and_encode(&dasm_state, NULL, NULL, NULL, NULL, name, 1);
+       handler = dasm_link_and_encode(&dasm_state, NULL, NULL, NULL, NULL, name, ZEND_JIT_TRACE_NUM);
 
 jit_failure:
        dasm_free(&dasm_state);