Skip to content

Commit 0ef0ea5

Browse files
committed
Temporary disable abstract test usage for inferring previous type of variables (previous value may be in CPU register and type of the stack slot may be inconsistent).
1 parent da0f327 commit 0ef0ea5

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

ext/opcache/jit/zend_jit_trace.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3128,7 +3128,11 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
31283128
if (opline->result_type == IS_CV) {
31293129
res_use_info = RES_USE_INFO();
31303130
} else {
3131+
#if USE_ABSTRACT_STACK_FOR_RES_USE_INFO
31313132
res_use_info = zend_jit_trace_type_to_info(STACK_VAR_TYPE(opline->result.var));
3133+
#else
3134+
res_use_info = -1;
3135+
#endif
31323136
}
31333137
res_info = RES_INFO();
31343138
res_addr = RES_REG_ADDR();
@@ -3203,7 +3207,11 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
32033207
if (opline->result_type == IS_CV) {
32043208
res_use_info = RES_USE_INFO();
32053209
} else {
3210+
#if USE_ABSTRACT_STACK_FOR_RES_USE_INFO
32063211
res_use_info = zend_jit_trace_type_to_info(STACK_VAR_TYPE(opline->result.var));
3212+
#else
3213+
res_use_info = -1;
3214+
#endif
32073215
}
32083216
res_addr = RES_REG_ADDR();
32093217
}
@@ -3270,7 +3278,11 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
32703278
if (opline->result_type == IS_CV) {
32713279
res_use_info = RES_USE_INFO();
32723280
} else {
3281+
#if USE_ABSTRACT_STACK_FOR_RES_USE_INFO
32733282
res_use_info = zend_jit_trace_type_to_info(STACK_VAR_TYPE(opline->result.var));
3283+
#else
3284+
res_use_info = -1;
3285+
#endif
32743286
}
32753287
res_addr = RES_REG_ADDR();
32763288
}

0 commit comments

Comments
 (0)