Skip to content

Commit ae85c4a

Browse files
nikicnikic
committed
Rename ZEND_DUP_TMP to ZEND_COPY_TMP
1 parent a17c114 commit ae85c4a

File tree

13 files changed

+25
-25
lines changed

13 files changed

+25
-25
lines changed

‎Zend/zend_compile.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2192,9 +2192,9 @@ static void zend_compile_memoized_expr(znode *result, zend_ast *expr) /* {{{ */
21922192
CG(memoize_mode) = ZEND_MEMOIZE_COMPILE;
21932193

21942194
if (result->op_type == IS_VAR) {
2195-
zend_emit_op(&memoized_result, ZEND_DUP_TMP, result, NULL);
2195+
zend_emit_op(&memoized_result, ZEND_COPY_TMP, result, NULL);
21962196
} else if (result->op_type == IS_TMP_VAR) {
2197-
zend_emit_op_tmp(&memoized_result, ZEND_DUP_TMP, result, NULL);
2197+
zend_emit_op_tmp(&memoized_result, ZEND_COPY_TMP, result, NULL);
21982198
} else {
21992199
memoized_result = *result;
22002200
}
@@ -7571,7 +7571,7 @@ void zend_compile_assign_coalesce(znode *result, zend_ast *ast) /* {{{ */
75717571
/* Adjust live range to end at newly inserted FREE opcode.
75727572
* We don't use emit_op here because we're manually manging live ranges. */
75737573
live_range->end = get_next_op_number();
7574-
live_range->var |= ZEND_LIVE_DUP;
7574+
live_range->var |= ZEND_LIVE_COPY;
75757575
opline = get_next_op();
75767576
opline->opcode = ZEND_FREE;
75777577
SET_NODE(opline->op1, node);

‎Zend/zend_compile.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ typedef struct _zend_try_catch_element {
172172
#define ZEND_LIVE_LOOP 1
173173
#define ZEND_LIVE_SILENCE 2
174174
#define ZEND_LIVE_ROPE 3
175-
#define ZEND_LIVE_DUP 4
175+
#define ZEND_LIVE_COPY 4
176176
#define ZEND_LIVE_MASK 7
177177

178178
typedef struct _zend_live_range {

‎Zend/zend_execute.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3682,7 +3682,7 @@ static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num,
36823682
if (!EG(error_reporting) && Z_LVAL_P(var) != 0) {
36833683
EG(error_reporting) = Z_LVAL_P(var);
36843684
}
3685-
} else if (kind == ZEND_LIVE_DUP) {
3685+
} else if (kind == ZEND_LIVE_COPY) {
36863686
/* DUP live ranges are not contiguous, so we need to check whether we
36873687
* are inside the liveness hole. */
36883688
if (!is_in_dup_liveness_hole(&EX(func)->op_array, range, op_num)) {

‎Zend/zend_vm_def.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8595,7 +8595,7 @@ ZEND_VM_HANDLER(195, ZEND_FUNC_GET_ARGS, UNUSED|CONST, UNUSED)
85958595
ZEND_VM_NEXT_OPCODE();
85968596
}
85978597

8598-
ZEND_VM_HANDLER(207, ZEND_DUP_TMP, TMPVAR, UNUSED)
8598+
ZEND_VM_HANDLER(207, ZEND_COPY_TMP, TMPVAR, UNUSED)
85998599
{
86008600
USE_OPLINE
86018601
zend_free_op free_op1;

‎Zend/zend_vm_execute.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18482,7 +18482,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INSTANCEOF_SPEC_TMPVAR_UNUSED_
1848218482
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
1848318483
}
1848418484

18485-
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DUP_TMP_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
18485+
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COPY_TMP_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
1848618486
{
1848718487
USE_OPLINE
1848818488
zend_free_op free_op1;
@@ -62733,7 +62733,7 @@ ZEND_API void execute_ex(zend_execute_data *ex)
6273362733
(void*)&&ZEND_POST_DEC_STATIC_PROP_SPEC_CV_VAR_LABEL,
6273462734
(void*)&&ZEND_POST_DEC_STATIC_PROP_SPEC_CV_UNUSED_LABEL,
6273562735
(void*)&&ZEND_NULL_LABEL,
62736-
(void*)&&ZEND_DUP_TMP_SPEC_TMPVAR_UNUSED_LABEL,
62736+
(void*)&&ZEND_COPY_TMP_SPEC_TMPVAR_UNUSED_LABEL,
6273762737
(void*)&&ZEND_JMP_FORWARD_SPEC_LABEL,
6273862738
(void*)&&ZEND_NULL_LABEL,
6273962739
(void*)&&ZEND_NULL_LABEL,
@@ -65946,9 +65946,9 @@ ZEND_API void execute_ex(zend_execute_data *ex)
6594665946
VM_TRACE(ZEND_INSTANCEOF_SPEC_TMPVAR_UNUSED)
6594765947
ZEND_INSTANCEOF_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
6594865948
HYBRID_BREAK();
65949-
HYBRID_CASE(ZEND_DUP_TMP_SPEC_TMPVAR_UNUSED):
65950-
VM_TRACE(ZEND_DUP_TMP_SPEC_TMPVAR_UNUSED)
65951-
ZEND_DUP_TMP_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
65949+
HYBRID_CASE(ZEND_COPY_TMP_SPEC_TMPVAR_UNUSED):
65950+
VM_TRACE(ZEND_COPY_TMP_SPEC_TMPVAR_UNUSED)
65951+
ZEND_COPY_TMP_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
6595265952
HYBRID_BREAK();
6595365953
HYBRID_CASE(ZEND_ADD_SPEC_TMPVAR_CV):
6595465954
VM_TRACE(ZEND_ADD_SPEC_TMPVAR_CV)
@@ -73941,7 +73941,7 @@ void zend_vm_init(void)
7394173941
ZEND_POST_DEC_STATIC_PROP_SPEC_CV_VAR_HANDLER,
7394273942
ZEND_POST_DEC_STATIC_PROP_SPEC_CV_UNUSED_HANDLER,
7394373943
ZEND_NULL_HANDLER,
73944-
ZEND_DUP_TMP_SPEC_TMPVAR_UNUSED_HANDLER,
73944+
ZEND_COPY_TMP_SPEC_TMPVAR_UNUSED_HANDLER,
7394573945
ZEND_JMP_FORWARD_SPEC_HANDLER,
7394673946
ZEND_NULL_HANDLER,
7394773947
ZEND_NULL_HANDLER,

‎Zend/zend_vm_handlers.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1901,7 +1901,7 @@
19011901
_(3718, ZEND_POST_DEC_STATIC_PROP_SPEC_CV_CONST) \
19021902
_(3720, ZEND_POST_DEC_STATIC_PROP_SPEC_CV_VAR) \
19031903
_(3721, ZEND_POST_DEC_STATIC_PROP_SPEC_CV_UNUSED) \
1904-
_(3723, ZEND_DUP_TMP_SPEC_TMPVAR_UNUSED) \
1904+
_(3723, ZEND_COPY_TMP_SPEC_TMPVAR_UNUSED) \
19051905
_(3724, ZEND_JMP_FORWARD_SPEC) \
19061906
_(3730, ZEND_ADD_LONG_NO_OVERFLOW_SPEC_TMPVARCV_CONST) \
19071907
_(3731, ZEND_ADD_LONG_NO_OVERFLOW_SPEC_TMPVARCV_TMPVARCV) \

‎Zend/zend_vm_opcodes.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ static const char *zend_vm_opcodes_names[208] = {
230230
"ZEND_PRE_DEC_STATIC_PROP",
231231
"ZEND_POST_INC_STATIC_PROP",
232232
"ZEND_POST_DEC_STATIC_PROP",
233-
"ZEND_DUP_TMP",
233+
"ZEND_COPY_TMP",
234234
};
235235

236236
static uint32_t zend_vm_opcodes_flags[208] = {

‎Zend/zend_vm_opcodes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ END_EXTERN_C()
279279
#define ZEND_PRE_DEC_STATIC_PROP 204
280280
#define ZEND_POST_INC_STATIC_PROP 205
281281
#define ZEND_POST_DEC_STATIC_PROP 206
282-
#define ZEND_DUP_TMP 207
282+
#define ZEND_COPY_TMP 207
283283

284284
#define ZEND_VM_LAST_OPCODE 207
285285

‎ext/opcache/Optimizer/block_pass.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
456456
break;
457457

458458
case ZEND_CASE:
459-
case ZEND_DUP_TMP:
459+
case ZEND_COPY_TMP:
460460
if (opline->op1_type & (IS_TMP_VAR|IS_VAR)) {
461461
/* Variable will be deleted later by FREE, so we can't optimize it */
462462
Tsource[VAR_NUM(opline->op1.var)] = NULL;

‎ext/opcache/Optimizer/sccp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1681,7 +1681,7 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o
16811681
case ZEND_QM_ASSIGN:
16821682
case ZEND_JMP_SET:
16831683
case ZEND_COALESCE:
1684-
case ZEND_DUP_TMP:
1684+
case ZEND_COPY_TMP:
16851685
SET_RESULT(result, op1);
16861686
break;
16871687
#if 0

0 commit comments

Comments
 (0)