diff options
| author | David Chase <drchase@google.com> | 2021-04-13 14:12:43 -0400 |
|---|---|---|
| committer | David Chase <drchase@google.com> | 2021-04-13 23:56:27 +0000 |
| commit | 34620364cb2ea52e0ebf400a9cda91f86cb38a25 (patch) | |
| tree | eb3de44e59eb3c92c77245a9cc8aabfc252267d3 /src/runtime | |
| parent | f2d5bd1ad306e87804d600d92105dc37279af83f (diff) | |
| download | go-34620364cb2ea52e0ebf400a9cda91f86cb38a25.tar.xz | |
runtime, cgo/test: improve debugging output
tests that run commands should log their actions in a
shell-pasteable way.
Change-Id: Ifeee88397047ef5a76925c5f30c213e83e535038
Reviewed-on: https://go-review.googlesource.com/c/go/+/309770
Trust: David Chase <drchase@google.com>
Run-TryBot: David Chase <drchase@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/plugin.go | 3 | ||||
| -rw-r--r-- | src/runtime/symtab.go | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/runtime/plugin.go b/src/runtime/plugin.go index 5e05be71ec..cd7fc5f848 100644 --- a/src/runtime/plugin.go +++ b/src/runtime/plugin.go @@ -115,7 +115,8 @@ func pluginftabverify(md *moduledata) { entry2 = f2.entry } badtable = true - println("ftab entry outside pc range: ", hex(entry), "/", hex(entry2), ": ", name, "/", name2) + println("ftab entry", hex(entry), "/", hex(entry2), ": ", + name, "/", name2, "outside pc range:[", hex(md.minpc), ",", hex(md.maxpc), "], modulename=", md.modulename, ", pluginpath=", md.pluginpath) } if badtable { throw("runtime: plugin has bad symbol table") diff --git a/src/runtime/symtab.go b/src/runtime/symtab.go index c0630c874e..cf759153e7 100644 --- a/src/runtime/symtab.go +++ b/src/runtime/symtab.go @@ -561,7 +561,11 @@ func moduledataverify1(datap *moduledata) { // Check that the pclntab's format is valid. hdr := datap.pcHeader if hdr.magic != 0xfffffffa || hdr.pad1 != 0 || hdr.pad2 != 0 || hdr.minLC != sys.PCQuantum || hdr.ptrSize != sys.PtrSize { - println("runtime: function symbol table header:", hex(hdr.magic), hex(hdr.pad1), hex(hdr.pad2), hex(hdr.minLC), hex(hdr.ptrSize)) + print("runtime: function symbol table header:", hex(hdr.magic), hex(hdr.pad1), hex(hdr.pad2), hex(hdr.minLC), hex(hdr.ptrSize)) + if datap.pluginpath != "" { + print(", plugin:", datap.pluginpath) + } + println() throw("invalid function symbol table\n") } @@ -576,7 +580,11 @@ func moduledataverify1(datap *moduledata) { if i+1 < nftab { f2name = funcname(f2) } - println("function symbol table not sorted by program counter:", hex(datap.ftab[i].entry), funcname(f1), ">", hex(datap.ftab[i+1].entry), f2name) + print("function symbol table not sorted by program counter:", hex(datap.ftab[i].entry), funcname(f1), ">", hex(datap.ftab[i+1].entry), f2name) + if datap.pluginpath != "" { + print(", plugin:", datap.pluginpath) + } + println() for j := 0; j <= i; j++ { print("\t", hex(datap.ftab[j].entry), " ", funcname(funcInfo{(*_func)(unsafe.Pointer(&datap.pclntable[datap.ftab[j].funcoff])), datap}), "\n") } |