authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-03-22 20:17:43-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-03-22 20:17:43-07:00
log98b932cfabb6d33f184f1cb9c3d4a39c41c5c4f7
tree2fb4a5bd2c56bec09c5c38a127d4dfc654a154d7
parentbe1cca341629b0783be6754b2d7642afce936acb

fix merge conflicts

1 files changed, 1 insertions(+), 1 deletions(-)

src/arch/arm/CodeGen.zig+1-1
...@@ -1153,7 +1153,7 @@ fn minMax(...@@ -1153,7 +1153,7 @@ fn minMax(
1153 .Float => return self.fail("TODO ARM min/max on floats", .{}),1153 .Float => return self.fail("TODO ARM min/max on floats", .{}),
1154 .Vector => return self.fail("TODO ARM min/max on vectors", .{}),1154 .Vector => return self.fail("TODO ARM min/max on vectors", .{}),
1155 .Int => {1155 .Int => {
1156 assert(lhs_ty.eql(rhs_ty));1156 assert(lhs_ty.eql(rhs_ty, self.target.*));
1157 const int_info = lhs_ty.intInfo(self.target.*);1157 const int_info = lhs_ty.intInfo(self.target.*);
1158 if (int_info.bits <= 32) {1158 if (int_info.bits <= 32) {
1159 const lhs_is_register = lhs == .register;1159 const lhs_is_register = lhs == .register;