From 1da64686f85da38af13c4ee186f261343455c697 Mon Sep 17 00:00:00 2001 From: Michael Munday Date: Wed, 8 Sep 2021 14:07:12 +0000 Subject: [PATCH] test/codegen: fix compilation of bitfield tests The codegen tests are currently skipped (see #48247) and the bitfield tests do not actually compile due to a duplicate function name (sbfiz5) added in CL 267602. Renaming the function fixes the issue. Updates #48247. Change-Id: I626fd5ef13732dc358e73ace9ddcc4cbb6ae5b21 Reviewed-on: https://go-review.googlesource.com/c/go/+/348391 Trust: Michael Munday Run-TryBot: Michael Munday TryBot-Result: Go Bot Reviewed-by: Cherry Mui --- test/codegen/bitfield.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/codegen/bitfield.go b/test/codegen/bitfield.go index d4ffbad85d..3ed9cfe603 100644 --- a/test/codegen/bitfield.go +++ b/test/codegen/bitfield.go @@ -99,10 +99,6 @@ func sbfiz5(x int32) int32 { return (x << 4) >> 3 } -func sbfiz5(x int32) int64 { - return int64(x+1) << 40 // arm64:"SBFIZ\t[$]40, R[0-9]+, [$]24",-"LSL" -} - func sbfiz6(x int16) int64 { return int64(x+1) << 3 // arm64:"SBFIZ\t[$]3, R[0-9]+, [$]16",-"LSL" } @@ -111,6 +107,10 @@ func sbfiz7(x int8) int64 { return int64(x+1) << 62 // arm64:"SBFIZ\t[$]62, R[0-9]+, [$]2",-"LSL" } +func sbfiz8(x int32) int64 { + return int64(x+1) << 40 // arm64:"SBFIZ\t[$]40, R[0-9]+, [$]24",-"LSL" +} + // sbfx func sbfx1(x int64) int64 { return (x << 3) >> 4 // arm64:"SBFX\t[$]1, R[0-9]+, [$]60",-"LSL",-"ASR" -- 2.50.0