Skip to content

Commit 9ff3230

Browse files
committed
Merge exit points
1 parent 626ccc4 commit 9ff3230

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11362,7 +11362,7 @@ static zend_bool zend_jit_fetch_reference(dasm_State **Dst, const zend_op *oplin
1136211362
{
1136311363
zend_jit_addr var_addr = *var_addr_ptr;
1136411364
uint32_t var_info = *var_info_ptr;
11365-
int32_t exit_point = zend_jit_trace_get_exit_point(opline, opline, NULL, ZEND_JIT_EXIT_TO_VM);
11365+
int32_t exit_point = zend_jit_trace_get_exit_point(opline, opline, NULL, 0);
1136611366
const void *exit_addr = zend_jit_trace_get_exit_addr(exit_point);
1136711367

1136811368
if (!exit_addr) {
@@ -11379,16 +11379,8 @@ static zend_bool zend_jit_fetch_reference(dasm_State **Dst, const zend_op *oplin
1137911379
var_type &= ~IS_TRACE_REFERENCE;
1138011380
if (var_type != IS_UNKNOWN
1138111381
&& (var_info & (MAY_BE_ANY|MAY_BE_UNDEF)) != (1 << var_type)) {
11382-
exit_point = zend_jit_trace_get_exit_point(opline, opline, NULL, 0);
11383-
exit_addr = zend_jit_trace_get_exit_addr(exit_point);
11384-
11385-
if (!exit_addr) {
11386-
return 0;
11387-
}
11388-
1138911382
| IF_NOT_Z_TYPE FCARG1a, var_type, &exit_addr
1139011383

11391-
//var_info = zend_jit_trace_type_to_info_ex(var_type, var_info);
1139211384
ZEND_ASSERT(var_info & (1 << var_type));
1139311385
if (var_type < IS_STRING) {
1139411386
var_info = (1 << var_type);

0 commit comments

Comments
 (0)