Skip to content

Commit 3f4a500

Browse files
committed
Cleanup macro/function names
1 parent 531d17f commit 3f4a500

File tree

3 files changed

+136
-134
lines changed

3 files changed

+136
-134
lines changed

ext/opcache/jit/zend_jit.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2162,17 +2162,17 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
21622162
|| op_array->opcodes[ssa->cfg.blocks[b].start - 1].opcode == ZEND_SWITCH_LONG
21632163
|| op_array->opcodes[ssa->cfg.blocks[b].start - 1].opcode == ZEND_SWITCH_STRING
21642164
|| op_array->opcodes[ssa->cfg.blocks[b].start - 1].opcode == ZEND_MATCH)) {
2165-
zend_jit_reset_opline();
2166-
if (!zend_jit_set_valid_ip(&dasm_state, op_array->opcodes + ssa->cfg.blocks[b].start)) {
2165+
zend_jit_reset_last_valid_opline();
2166+
if (!zend_jit_set_ip(&dasm_state, op_array->opcodes + ssa->cfg.blocks[b].start)) {
21672167
goto jit_failure;
21682168
}
21692169
} else {
2170-
zend_jit_set_opline(op_array->opcodes + ssa->cfg.blocks[b].start);
2170+
zend_jit_set_last_valid_opline(op_array->opcodes + ssa->cfg.blocks[b].start);
21712171
}
21722172
} else if (ssa->cfg.blocks[b].flags & ZEND_BB_TARGET) {
2173-
zend_jit_reset_opline();
2173+
zend_jit_reset_last_valid_opline();
21742174
} else if (ssa->cfg.blocks[b].flags & (ZEND_BB_START|ZEND_BB_RECV_ENTRY|ZEND_BB_ENTRY)) {
2175-
zend_jit_set_opline(op_array->opcodes + ssa->cfg.blocks[b].start);
2175+
zend_jit_set_last_valid_opline(op_array->opcodes + ssa->cfg.blocks[b].start);
21762176
}
21772177
if (ssa->cfg.blocks[b].flags & ZEND_BB_LOOP_HEADER) {
21782178
if (!zend_jit_check_timeout(&dasm_state, op_array->opcodes + ssa->cfg.blocks[b].start, NULL)) {
@@ -3012,7 +3012,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
30123012
goto jit_failure;
30133013
}
30143014
}
3015-
zend_jit_set_opline(opline+1);
3015+
zend_jit_set_last_valid_opline(opline+1);
30163016
break;
30173017
case ZEND_NOP:
30183018
case ZEND_OP_DATA:

ext/opcache/jit/zend_jit_trace.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3141,12 +3141,12 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
31413141
parent_trace ? &zend_jit_traces[parent_trace] : NULL, exit_num);
31423142

31433143
if (!parent_trace) {
3144-
zend_jit_set_opline(opline);
3144+
zend_jit_set_last_valid_opline(opline);
31453145
} else {
31463146
if (zend_jit_traces[parent_trace].exit_info[exit_num].opline == NULL) {
31473147
zend_jit_trace_opline_guard(&dasm_state, opline);
31483148
} else {
3149-
zend_jit_reset_opline();
3149+
zend_jit_reset_last_valid_opline();
31503150
}
31513151
}
31523152

@@ -5078,7 +5078,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
50785078
|| p->stop == ZEND_JIT_TRACE_STOP_RECURSIVE_CALL
50795079
|| p->stop == ZEND_JIT_TRACE_STOP_RECURSIVE_RET) {
50805080
if (p->stop != ZEND_JIT_TRACE_STOP_RECURSIVE_RET) {
5081-
if (!zend_jit_set_valid_ip(&dasm_state, p->opline)) {
5081+
if (!zend_jit_set_ip(&dasm_state, p->opline)) {
50825082
goto jit_failure;
50835083
}
50845084
}
@@ -5097,7 +5097,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
50975097
goto jit_failure;
50985098
}
50995099
if (p->stop == ZEND_JIT_TRACE_STOP_LINK) {
5100-
if (!zend_jit_set_valid_ip(&dasm_state, p->opline)) {
5100+
if (!zend_jit_set_ip(&dasm_state, p->opline)) {
51015101
goto jit_failure;
51025102
}
51035103
t->link = zend_jit_find_trace(p->opline->handler);

0 commit comments

Comments
 (0)