From d81ed4d62192cd89dbf664c42e26c35a052dd9ce Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Fri, 2 Sep 2022 16:59:07 -0400 Subject: runtime: rename inlinedCall.func_ to inlinedCall.nameOff The meaning of this field is unchanged, this CL simply gives it a more descriptive name, as func_ makes it sound like a reference to the _func. Change-Id: I70e54f34bede7636ce4d7b9dd0f7557308f02143 Reviewed-on: https://go-review.googlesource.com/c/go/+/427961 Reviewed-by: Cherry Mui Run-TryBot: Michael Pratt Reviewed-by: Austin Clements TryBot-Result: Gopher Robot --- src/runtime/symtab.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/runtime/symtab.go') diff --git a/src/runtime/symtab.go b/src/runtime/symtab.go index a1a7eba83c..78c49b0dbc 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].func_) + 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].func_) + name := funcnameFromNameoff(f, inltree[ix].nameOff) file, line := funcline(f, pc) fi := &funcinl{ ones: ^uint32(0), @@ -1174,6 +1174,6 @@ func stackmapdata(stkmap *stackmap, n int32) bitvector { type inlinedCall struct { funcID funcID // type of the called function _ [3]byte - func_ int32 // offset into pclntab for name of called function + nameOff int32 // offset into pclntab for name of called function parentPc int32 // position of an instruction whose source position is the call site (offset from entry) } -- cgit v1.3