From: Dan Scales Date: Wed, 13 Oct 2021 17:27:01 +0000 (-0700) Subject: cmd/compile: fix inst_test.go for riscv5 X-Git-Tag: go1.18beta1~912 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b90d258b18e2fe728a3d7c856ad08c7fa6845fc2;p=gostls13.git cmd/compile: fix inst_test.go for riscv5 On riscv5, apparently extra wrappers (trampolines) are created for some functions with the suffix "-tramp". Modify inst_test.go to not match these "-tramp" wrappers. Change-Id: I754c724f03555c30f8e1b5cfc08152555bbbcf17 Reviewed-on: https://go-review.googlesource.com/c/go/+/355650 Run-TryBot: Dan Scales Reviewed-by: Keith Randall Trust: Dan Scales --- diff --git a/src/cmd/compile/internal/test/inst_test.go b/src/cmd/compile/internal/test/inst_test.go index 59a67cb545..951f6a05aa 100644 --- a/src/cmd/compile/internal/test/inst_test.go +++ b/src/cmd/compile/internal/test/inst_test.go @@ -50,7 +50,9 @@ func TestInst(t *testing.T) { if output, err = cmd.CombinedOutput(); err != nil { t.Fatalf("Failed: %v:\nOut: %s\n", err, output) } - re := regexp.MustCompile(`\bSort\[.*shape.*\]`) + // Look for shape-based instantiation of Sort, but ignore any extra wrapper + // ending in "-tramp" (which are created on riscv). + re := regexp.MustCompile(`\bSort\[.*shape.*\][^-]`) r := re.FindAllIndex(output, -1) if len(r) != 1 { t.Fatalf("Wanted 1 instantiations of Sort function, got %d\n", len(r))