chore: 移除 git 冲突残留文件

6 days ago · 1993380d4a
parent ee3b42ac40
commit 1993380d4a
2 changed files with 0 additions and 1837 deletions
--- a/src/mir/Lowering.cpp.orig
+++ b/src/mir/Lowering.cpp.orig
--- a/src/mir/Lowering.cpp.rej
+++ b/src/mir/Lowering.cpp.rej
@ -1,26 +0,0 @@
--- src/mir/Lowering.cpp
-+++ src/mir/Lowering.cpp
-@@ -339,10 +339,19 @@
-       {
-         if (IsIntegerCompareOpcode(bin->GetOpcode()))
-         {
-           int lhs = EmitIntValue(bin->GetLhs(), function, value_vregs,
-                                 scalar_slots, array_slots, block);
-          int rhs = EmitIntValue(bin->GetRhs(), function, value_vregs,
-                                scalar_slots, array_slots, block);
-          block.Append(Opcode::CmpRR,
-                       {Operand::VReg(lhs, VRegClass::Int), Operand::VReg(rhs, VRegClass::Int)});
-+          int rhs_imm;
-+          if (TryGetConstantInt(bin->GetRhs(), rhs_imm))
-+          {
-+            block.Append(Opcode::CmpImm,
-+                         {Operand::VReg(lhs, VRegClass::Int), Operand::Imm(rhs_imm)});
-+          }
-+          else
-+          {
-+            int rhs = EmitIntValue(bin->GetRhs(), function, value_vregs,
-+                                  scalar_slots, array_slots, block);
-+            block.Append(Opcode::CmpRR,
-+                         {Operand::VReg(lhs, VRegClass::Int), Operand::VReg(rhs, VRegClass::Int)});
-+          }
-