Commit 98b932cfab

Andrew Kelley <andrew@ziglang.org>
2022-03-23 04:17:43
fix merge conflicts
master
1 parent be1cca3
Changed files (1)
src
arch
arm
CodeGen.zig
src/arch/arm/CodeGen.zig
@@ -1153,7 +1153,7 @@ fn minMax(
         .Float => return self.fail("TODO ARM min/max on floats", .{}),
         .Vector => return self.fail("TODO ARM min/max on vectors", .{}),
         .Int => {
-            assert(lhs_ty.eql(rhs_ty));
+            assert(lhs_ty.eql(rhs_ty, self.target.*));
             const int_info = lhs_ty.intInfo(self.target.*);
             if (int_info.bits <= 32) {
                 const lhs_is_register = lhs == .register;