diff options
| author | David Lazar <lazard@golang.org> | 2017-02-19 14:01:42 -0500 |
|---|---|---|
| committer | David Lazar <lazard@golang.org> | 2017-02-19 21:27:16 +0000 |
| commit | b9574f46f9079a4237a9dd42d30a6ec91723ee5a (patch) | |
| tree | 1b4feca63bf1461b8d69e14ad3172f9d8b9f0829 /src/cmd/objdump | |
| parent | 3892d507964dce100c55c3fa14f414bd14c34e98 (diff) | |
| download | go-b9574f46f9079a4237a9dd42d30a6ec91723ee5a.tar.gz go-b9574f46f9079a4237a9dd42d30a6ec91723ee5a.zip | |
cmd/objdump: make test independent of inlining
Fixes #19189.
Change-Id: Ice69216c7fc2eaeb3dbbdcd08a8284204c7f52ef
Reviewed-on: https://go-review.googlesource.com/37237
Run-TryBot: David Lazar <lazard@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Diffstat (limited to 'src/cmd/objdump')
| -rw-r--r-- | src/cmd/objdump/objdump_test.go | 6 | ||||
| -rw-r--r-- | src/cmd/objdump/testdata/fmthello.go | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/cmd/objdump/objdump_test.go b/src/cmd/objdump/objdump_test.go index 10fc716463..419be6717a 100644 --- a/src/cmd/objdump/objdump_test.go +++ b/src/cmd/objdump/objdump_test.go @@ -60,7 +60,7 @@ var x86Need = []string{ "fmthello.go:6", "TEXT main.main(SB)", "JMP main.main(SB)", - "CALL fmt.Println(SB)", + "CALL main.Println(SB)", "RET", } @@ -68,7 +68,7 @@ var armNeed = []string{ "fmthello.go:6", "TEXT main.main(SB)", //"B.LS main.main(SB)", // TODO(rsc): restore; golang.org/issue/9021 - "BL fmt.Println(SB)", + "BL main.Println(SB)", "RET", } @@ -76,7 +76,7 @@ var ppcNeed = []string{ "fmthello.go:6", "TEXT main.main(SB)", "BR main.main(SB)", - "CALL fmt.Println(SB)", + "CALL main.Println(SB)", "RET", } diff --git a/src/cmd/objdump/testdata/fmthello.go b/src/cmd/objdump/testdata/fmthello.go index 635db7ae6c..e98268199d 100644 --- a/src/cmd/objdump/testdata/fmthello.go +++ b/src/cmd/objdump/testdata/fmthello.go @@ -3,5 +3,10 @@ package main import "fmt" func main() { - fmt.Println("hello, world") + Println("hello, world") +} + +//go:noinline +func Println(s string) { + fmt.Println(s) } |