languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-05 16:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

runtime: rename inlinedCall.func_ to inlinedCall.nameOff

Browse source 
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 <cherryyz@google.com>
Run-TryBot: Michael Pratt <mpratt@google.com>
Reviewed-by: Austin Clements <austin@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Michael Pratt 2022-09-02 16:59:07 -04:00
parent 0752f4a12c
commit d81ed4d621
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/runtime/preempt.go
View file

@ -418,7 +418,7 @@ func isAsyncSafePoint(gp *g, pc, sp, lr uintptr) (bool, uintptr) {
inltree := (*[1 << 20]inlinedCall)(inldata)
ix := pcdatavalue(f, _PCDATA_InlTreeIndex, pc, nil)
if ix >= 0 {
name = funcnameFromNameoff(f, inltree[ix].func_)
name = funcnameFromNameoff(f, inltree[ix].nameOff)
}
}
if hasPrefix(name, "runtime.") ||

2
src/runtime/race.go
View file

@ -187,7 +187,7 @@ func raceSymbolizeCode(ctx *symbolizeCodeContext) {
continue
}
ctx.pc = f.Entry() + uintptr(inltree[ix].parentPc) // "caller" pc
ctx.fn = cfuncnameFromNameoff(fi, inltree[ix].func_)
ctx.fn = cfuncnameFromNameoff(fi, inltree[ix].nameOff)
ctx.line = uintptr(line)
ctx.file = &bytes(file)[0] // assume NUL-terminated
ctx.off = pc - f.Entry()

6
src/runtime/symtab.go
View file

@ -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)
}

4
src/runtime/traceback.go
View file

@ -405,7 +405,7 @@ func gentraceback(pc0, sp0, lr0 uintptr, gp *g, skip int, pcbuf *uintptr, max in
// Create a fake _func for the
// inlined function.
inlFunc.nameoff = inltree[ix].func_
inlFunc.nameoff = inltree[ix].nameOff
inlFunc.funcID = inltree[ix].funcID
if (flags&_TraceRuntimeFrames) != 0 || showframe(inlFuncInfo, gp, nprint == 0, inlFuncInfo.funcID, lastFuncID) {
@ -808,7 +808,7 @@ func printAncestorTracebackFuncInfo(f funcInfo, pc uintptr) {
inltree := (*[1 << 20]inlinedCall)(inldata)
ix := pcdatavalue(f, _PCDATA_InlTreeIndex, pc, nil)
if ix >= 0 {
name = funcnameFromNameoff(f, inltree[ix].func_)
name = funcnameFromNameoff(f, inltree[ix].nameOff)
}
}
file, line := funcline(f, pc)