From 2299e5ff1dc924a2dca0c0c2def6f1e7b71a668f Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 8 May 2021 23:12:34 -0700 Subject: fix merge conflicts from previous commit Any PRs merged after the one that made testing functions return errors needs to get rebased! --- src/codegen/x86_64.zig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/codegen') diff --git a/src/codegen/x86_64.zig b/src/codegen/x86_64.zig index dd0b74d46a..5a09f48e17 100644 --- a/src/codegen/x86_64.zig +++ b/src/codegen/x86_64.zig @@ -582,7 +582,7 @@ test "x86_64 Encoder helpers" { Register.edi.low_id(), ); - testing.expectEqualSlices(u8, &[_]u8{ 0x0f, 0xaf, 0xc7 }, code.items); + try testing.expectEqualSlices(u8, &[_]u8{ 0x0f, 0xaf, 0xc7 }, code.items); } // simple mov @@ -602,7 +602,7 @@ test "x86_64 Encoder helpers" { Register.eax.low_id(), ); - testing.expectEqualSlices(u8, &[_]u8{ 0x89, 0xf8 }, code.items); + try testing.expectEqualSlices(u8, &[_]u8{ 0x89, 0xf8 }, code.items); } // signed integer addition of 32-bit sign extended immediate to 64 bit register @@ -629,7 +629,7 @@ test "x86_64 Encoder helpers" { ); encoder.imm32(2147483647); - testing.expectEqualSlices(u8, &[_]u8{ 0x48, 0x81, 0xc1, 0xff, 0xff, 0xff, 0x7f }, code.items); + try testing.expectEqualSlices(u8, &[_]u8{ 0x48, 0x81, 0xc1, 0xff, 0xff, 0xff, 0x7f }, code.items); } } -- cgit v1.2.3