From: Michael Pratt Date: Tue, 6 Sep 2022 22:03:30 +0000 (-0400) Subject: runtime: rename _func.entryoff to entryOff X-Git-Tag: go1.20rc1~1138 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7ebaa6587bb0d0454c87796fd894c751f91f2bff;p=gostls13.git runtime: rename _func.entryoff to entryOff To match _func.nameOff. Change-Id: I75e71cadaa0f7ca8844d1b49950673797b227074 Reviewed-on: https://go-review.googlesource.com/c/go/+/428658 Run-TryBot: Michael Pratt Reviewed-by: Cherry Mui TryBot-Result: Gopher Robot Auto-Submit: Michael Pratt --- diff --git a/src/runtime/runtime2.go b/src/runtime/runtime2.go index 7fdf163440..1c620bbfbe 100644 --- a/src/runtime/runtime2.go +++ b/src/runtime/runtime2.go @@ -858,7 +858,7 @@ const ( // Keep in sync with linker (../cmd/link/internal/ld/pcln.go:/pclntab) // and with package debug/gosym and with symtab.go in package runtime. type _func struct { - entryoff uint32 // start pc, as offset from moduledata.text/pcHeader.textStart + entryOff uint32 // start pc, as offset from moduledata.text/pcHeader.textStart nameOff int32 // function name, as index into moduledata.funcnametab. args int32 // in/out args size diff --git a/src/runtime/symtab.go b/src/runtime/symtab.go index b7bf7d77a9..79ca5cfc44 100644 --- a/src/runtime/symtab.go +++ b/src/runtime/symtab.go @@ -810,12 +810,12 @@ func (f funcInfo) _Func() *Func { // isInlined reports whether f should be re-interpreted as a *funcinl. func (f *_func) isInlined() bool { - return f.entryoff == ^uint32(0) // see comment for funcinl.ones + return f.entryOff == ^uint32(0) // see comment for funcinl.ones } // entry returns the entry PC for f. func (f funcInfo) entry() uintptr { - return f.datap.textAddr(f.entryoff) + return f.datap.textAddr(f.entryOff) } // findfunc looks up function metadata for a PC.