From f2a7b300c471ee7ad9a925f1085ad86537f68154 Mon Sep 17 00:00:00 2001 From: FICTURE7 Date: Fri, 20 Aug 2021 21:42:00 +0400 Subject: [PATCH] Fix type mismatch in `BitwiseAnd` simplification (#2571) * Fix type mismatch in `BitwiseAnd` simplification `TryEliminateBitwiseAnd` would turn the `BitwiseAnd` operation into a copy of the wrong type. E.g: Before `Simplification`: ```llvm i64 %0 = BitwiseAnd i64 0x0, %1 ``` After `Simplication`: ```llvm i64 %0 = Copy i32 0x0 ``` Since the with the changes in #2515, we iterate in reverse order and `Simplication`, `ConstantFolding` does not indicate if it modified the CFG, the second pass to "retype" the copy into the proper destination type does not happen. This also blocked copy propagation since its destination type did not match with its source type. But in the cases I've seen, the `PreAllocator` would insert a copy for the propagated constant, which results in no diffs. Since the copy remained as is, asserts are fired when generating it. * Set PPTC version --- ARMeilleure/CodeGen/Optimizations/Simplification.cs | 2 +- ARMeilleure/Translation/PTC/Ptc.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ARMeilleure/CodeGen/Optimizations/Simplification.cs b/ARMeilleure/CodeGen/Optimizations/Simplification.cs index 341143d861..a439d64244 100644 --- a/ARMeilleure/CodeGen/Optimizations/Simplification.cs +++ b/ARMeilleure/CodeGen/Optimizations/Simplification.cs @@ -71,7 +71,7 @@ namespace ARMeilleure.CodeGen.Optimizations } else if (IsConstEqual(x, 0) || IsConstEqual(y, 0)) { - operation.TurnIntoCopy(Const(0)); + operation.TurnIntoCopy(Const(x.Type, 0)); } } diff --git a/ARMeilleure/Translation/PTC/Ptc.cs b/ARMeilleure/Translation/PTC/Ptc.cs index 1ed5494522..8d4f971bdb 100644 --- a/ARMeilleure/Translation/PTC/Ptc.cs +++ b/ARMeilleure/Translation/PTC/Ptc.cs @@ -27,7 +27,7 @@ namespace ARMeilleure.Translation.PTC private const string OuterHeaderMagicString = "PTCohd\0\0"; private const string InnerHeaderMagicString = "PTCihd\0\0"; - private const uint InternalVersion = 2515; //! To be incremented manually for each change to the ARMeilleure project. + private const uint InternalVersion = 2571; //! To be incremented manually for each change to the ARMeilleure project. private const string ActualDir = "0"; private const string BackupDir = "1";