diff options
| author | Michael Pratt <mpratt@google.com> | 2022-09-06 17:57:07 -0400 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-09-07 15:11:05 +0000 |
| commit | 196003f9fd8d754a926ea8bc3aa5207eaea87528 (patch) | |
| tree | 6daa1e906a91a7d39d4c541ce540e7e41df4d7fc /src/runtime/symtab.go | |
| parent | d81ed4d62192cd89dbf664c42e26c35a052dd9ce (diff) | |
| download | go-196003f9fd8d754a926ea8bc3aa5207eaea87528.tar.xz | |
runtime: rename _func.nameoff and friends to nameOff
Switch to the more Go-style name to match inlinedCall.nameOff.
Change-Id: I2115b27af8309e1ead7d61ecc65fe4fc966030f7
Reviewed-on: https://go-review.googlesource.com/c/go/+/428657
Run-TryBot: Michael Pratt <mpratt@google.com>
Auto-Submit: Michael Pratt <mpratt@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Diffstat (limited to 'src/runtime/symtab.go')
| -rw-r--r-- | src/runtime/symtab.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/runtime/symtab.go b/src/runtime/symtab.go index 78c49b0dbc..b7bf7d77a9 100644 --- a/src/runtime/symtab.go +++ b/src/runtime/symtab.go @@ -116,7 +116,7 @@ func (ci *Frames) Next() (frame Frame, more bool) { if ix >= 0 { // Note: entry is not modified. It always refers to a real frame, not an inlined one. f = nil - name = funcnameFromNameoff(funcInfo, inltree[ix].nameOff) + name = funcnameFromNameOff(funcInfo, inltree[ix].nameOff) // File/line from funcline1 below are already correct. } } @@ -726,7 +726,7 @@ func FuncForPC(pc uintptr) *Func { // The runtime currently doesn't have function end info, alas. if ix := pcdatavalue1(f, _PCDATA_InlTreeIndex, pc, nil, false); ix >= 0 { inltree := (*[1 << 20]inlinedCall)(inldata) - name := funcnameFromNameoff(f, inltree[ix].nameOff) + name := funcnameFromNameOff(f, inltree[ix].nameOff) file, line := funcline(f, pc) fi := &funcinl{ ones: ^uint32(0), @@ -967,10 +967,10 @@ func pcvalue(f funcInfo, off uint32, targetpc uintptr, cache *pcvalueCache, stri } func cfuncname(f funcInfo) *byte { - if !f.valid() || f.nameoff == 0 { + if !f.valid() || f.nameOff == 0 { return nil } - return &f.datap.funcnametab[f.nameoff] + return &f.datap.funcnametab[f.nameOff] } func funcname(f funcInfo) string { @@ -993,15 +993,15 @@ func funcpkgpath(f funcInfo) string { return name[:i] } -func cfuncnameFromNameoff(f funcInfo, nameoff int32) *byte { +func cfuncnameFromNameOff(f funcInfo, nameOff int32) *byte { if !f.valid() { return nil } - return &f.datap.funcnametab[nameoff] + return &f.datap.funcnametab[nameOff] } -func funcnameFromNameoff(f funcInfo, nameoff int32) string { - return gostringnocopy(cfuncnameFromNameoff(f, nameoff)) +func funcnameFromNameOff(f funcInfo, nameOff int32) string { + return gostringnocopy(cfuncnameFromNameOff(f, nameOff)) } func funcfile(f funcInfo, fileno int32) string { |