diff options
| author | Cherry Zhang <cherryyz@google.com> | 2020-06-02 14:52:16 -0400 |
|---|---|---|
| committer | Cherry Zhang <cherryyz@google.com> | 2020-06-03 19:20:41 +0000 |
| commit | b7717e46340b7ffe5fd53313f10dfa85a141f77a (patch) | |
| tree | a504e5e228950afa3b83b4acf7576f900c328710 /src/cmd/objdump | |
| parent | 9984ef824c635421c225f5bf3d5573a1fbd94dde (diff) | |
| download | go-b7717e46340b7ffe5fd53313f10dfa85a141f77a.tar.gz go-b7717e46340b7ffe5fd53313f10dfa85a141f77a.zip | |
Revert "cmd/internal/goobj: add index to symbol name for indexed symbols"
This reverts CL 229246.
For new indexed object files, in CL 229246 we added symbol index
to tools (nm, objdump) output. This affects external tools that
parse those outputs. And the added index doesn't look very nice.
In this release we take it out. For future releases we may
introduce a flag to tools (nm, objdump) and optionally dump the
symbol index.
For refererenced (not defined) indexed symbols, currently the
symbol is still referenced only by index, not by name. The next
CL will make the object file self-contained, so tools can dump
the symbol names properly (as before).
For #38875.
Change-Id: I07375e85a8e826e15c82fa452d11f0eaf8535a00
Reviewed-on: https://go-review.googlesource.com/c/go/+/236167
Reviewed-by: Than McIntosh <thanm@google.com>
Reviewed-by: Jeremy Faller <jeremy@golang.org>
Diffstat (limited to 'src/cmd/objdump')
| -rw-r--r-- | src/cmd/objdump/objdump_test.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/cmd/objdump/objdump_test.go b/src/cmd/objdump/objdump_test.go index 814cbf4564..c974d6707b 100644 --- a/src/cmd/objdump/objdump_test.go +++ b/src/cmd/objdump/objdump_test.go @@ -14,7 +14,6 @@ import ( "os" "os/exec" "path/filepath" - "regexp" "runtime" "strings" "testing" @@ -285,11 +284,9 @@ func TestDisasmGoobj(t *testing.T) { if err != nil { t.Fatalf("go tool compile fmthello.go: %v\n%s", err, out) } - - // TODO(go115newobj): drop old object file support. need := []string{ - `main(#\d+)?\(SB\)`, // either new or old object file - `fmthello\.go:6`, + "main(SB)", + "fmthello.go:6", } args = []string{ @@ -305,9 +302,8 @@ func TestDisasmGoobj(t *testing.T) { text := string(out) ok := true for _, s := range need { - re := regexp.MustCompile(s) - if !re.MatchString(text) { - t.Errorf("disassembly missing %q", s) + if !strings.Contains(text, s) { + t.Errorf("disassembly missing '%s'", s) ok = false } } |