diff options
| author | Dan Scales <danscales@google.com> | 2021-10-13 10:27:01 -0700 |
|---|---|---|
| committer | Dan Scales <danscales@google.com> | 2021-10-13 20:31:25 +0000 |
| commit | b90d258b18e2fe728a3d7c856ad08c7fa6845fc2 (patch) | |
| tree | 028a7fc47c11fb24f078c121121831d6a95c804e /src | |
| parent | 40f82f8a092ac1f23eb3af86f34b7436a6fc19e0 (diff) | |
| download | go-b90d258b18e2fe728a3d7c856ad08c7fa6845fc2.tar.xz | |
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 <danscales@google.com>
Reviewed-by: Keith Randall <khr@golang.org>
Trust: Dan Scales <danscales@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/compile/internal/test/inst_test.go | 4 |
1 files changed, 3 insertions, 1 deletions
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)) |