Skip to content

Commit a7f789e

Browse files
committed
Update IR
IR commit: 17fa2605a526d9512224123c0e7e565307a17fe9
1 parent 0d616d1 commit a7f789e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

ext/opcache/jit/ir/ir_fold.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -2523,8 +2523,8 @@ IR_FOLD(ADD(SUB, C_ADDR))
25232523
/* (c1 - x) + c2 => (c1 + c2) - x */
25242524
val.u64 = ctx->ir_base[op1_insn->op1].val.u64 + op2_insn->val.u64;
25252525
opt++; /* ADD -> SUB */
2526-
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
25272526
op2 = op1_insn->op2;
2527+
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
25282528
IR_FOLD_RESTART;
25292529
}
25302530
IR_FOLD_NEXT;
@@ -2549,8 +2549,8 @@ IR_FOLD(ADD(SUB, C_I64))
25492549
/* (c1 - x) + c2 => (c1 + c2) - x */
25502550
val.i64 = ctx->ir_base[op1_insn->op1].val.i64 + op2_insn->val.i64;
25512551
opt++; /* ADD -> SUB */
2552-
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
25532552
op2 = op1_insn->op2;
2553+
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
25542554
IR_FOLD_RESTART;
25552555
}
25562556
IR_FOLD_NEXT;
@@ -2602,8 +2602,8 @@ IR_FOLD(SUB(C_ADDR, ADD))
26022602
if (IR_IS_CONST_REF(op2_insn->op2) && !IR_IS_SYM_CONST(ctx->ir_base[op2_insn->op2].op)) {
26032603
/* c1 - (x + c2) => (c1 - c2) - x */
26042604
val.u64 = op1_insn->val.u64 - ctx->ir_base[op2_insn->op2].val.u64;
2605-
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
26062605
op2 = op2_insn->op1;
2606+
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
26072607
IR_FOLD_RESTART;
26082608
}
26092609
IR_FOLD_NEXT;
@@ -2617,8 +2617,8 @@ IR_FOLD(SUB(C_I64, ADD))
26172617
if (IR_IS_CONST_REF(op2_insn->op2) && !IR_IS_SYM_CONST(ctx->ir_base[op2_insn->op2].op)) {
26182618
/* c1 - (x + c2) => (c1 - c2) - x */
26192619
val.i64 = op1_insn->val.i64 - ctx->ir_base[op2_insn->op2].val.i64;
2620-
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
26212620
op2 = op2_insn->op1;
2621+
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
26222622
IR_FOLD_RESTART;
26232623
}
26242624
IR_FOLD_NEXT;
@@ -2643,8 +2643,8 @@ IR_FOLD(SUB(SUB, C_ADDR))
26432643
} else if (IR_IS_CONST_REF(op1_insn->op1) && !IR_IS_SYM_CONST(ctx->ir_base[op1_insn->op1].op)) {
26442644
/* (c1 - x) - c2 => (c1 - c2) - x */
26452645
val.u64 = ctx->ir_base[op1_insn->op1].val.u64 - op2_insn->val.u64;
2646-
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
26472646
op2 = op1_insn->op2;
2647+
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
26482648
IR_FOLD_RESTART;
26492649
}
26502650
IR_FOLD_NEXT;
@@ -2668,8 +2668,8 @@ IR_FOLD(SUB(SUB, C_I64))
26682668
} else if (IR_IS_CONST_REF(op1_insn->op1) && !IR_IS_SYM_CONST(ctx->ir_base[op1_insn->op1].op)) {
26692669
/* (c1 - x) - c2 => (c1 - c2) - x */
26702670
val.i64 = ctx->ir_base[op1_insn->op1].val.i64 - op2_insn->val.i64;
2671-
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
26722671
op2 = op1_insn->op2;
2672+
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
26732673
IR_FOLD_RESTART;
26742674
}
26752675
IR_FOLD_NEXT;
@@ -2684,8 +2684,8 @@ IR_FOLD(SUB(C_ADDR, SUB))
26842684
if (IR_IS_CONST_REF(op2_insn->op2) && !IR_IS_SYM_CONST(ctx->ir_base[op2_insn->op2].op)) {
26852685
/* c1 - (x - c2) => (c1 + c2) - x */
26862686
val.u64 = op1_insn->val.u64 + ctx->ir_base[op2_insn->op2].val.u64;
2687-
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
26882687
op2 = op2_insn->op1;
2688+
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
26892689
IR_FOLD_RESTART;
26902690
} else if (IR_IS_CONST_REF(op2_insn->op1) && !IR_IS_SYM_CONST(ctx->ir_base[op2_insn->op1].op)) {
26912691
/* c1 - (c2 - x) => x + (c1 - c2) */
@@ -2709,8 +2709,8 @@ IR_FOLD(SUB(C_I64, SUB))
27092709
if (IR_IS_CONST_REF(op2_insn->op2) && !IR_IS_SYM_CONST(ctx->ir_base[op2_insn->op2].op)) {
27102710
/* c1 - (x - c2) => (c1 + c2) - x */
27112711
val.i64 = op1_insn->val.i64 + ctx->ir_base[op2_insn->op2].val.i64;
2712-
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
27132712
op2 = op2_insn->op1;
2713+
op1 = ir_const(ctx, val, IR_OPT_TYPE(opt));
27142714
IR_FOLD_RESTART;
27152715
} else if (IR_IS_CONST_REF(op2_insn->op1) && !IR_IS_SYM_CONST(ctx->ir_base[op2_insn->op1].op)) {
27162716
/* c1 - (c2 - x) => x + (c1 - c2) */

0 commit comments

Comments
 (0)