From 0efc8b21881ab35fdb45547088b1935fc8ebf263 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Mon, 20 Feb 2017 22:37:07 -0500 Subject: runtime: avoid repeated findmoduledatap calls Currently almost every function that deals with a *_func has to first look up the *moduledata for the module containing the function's entry point. This means we almost always do at least two identical module lookups whenever we deal with a *_func (one to get the *_func and another to get something from its module data) and sometimes several more. Fix this by making findfunc return a new funcInfo type that embeds *_func, but also includes the *moduledata, and making all of the functions that currently take a *_func instead take a funcInfo and use the already-found *moduledata. This transformation is trivial for the most part, since the *_func type is usually inferred. The annoying part is that we can no longer use nil to indicate failure, so this introduces a funcInfo.valid() method and replaces nil checks with calls to valid. Change-Id: I9b8075ef1c31185c1943596d96dec45c7ab5100f Reviewed-on: https://go-review.googlesource.com/37331 Run-TryBot: Austin Clements TryBot-Result: Gobot Gobot Reviewed-by: Michael Hudson-Doyle --- src/runtime/stack.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/runtime/stack.go') diff --git a/src/runtime/stack.go b/src/runtime/stack.go index d6a4e4ea80..92b8a2b921 100644 --- a/src/runtime/stack.go +++ b/src/runtime/stack.go @@ -569,7 +569,7 @@ func ptrbit(bv *gobitvector, i uintptr) uint8 { // bv describes the memory starting at address scanp. // Adjust any pointers contained therein. -func adjustpointers(scanp unsafe.Pointer, cbv *bitvector, adjinfo *adjustinfo, f *_func) { +func adjustpointers(scanp unsafe.Pointer, cbv *bitvector, adjinfo *adjustinfo, f funcInfo) { bv := gobv(*cbv) minp := adjinfo.old.lo maxp := adjinfo.old.hi @@ -589,7 +589,7 @@ func adjustpointers(scanp unsafe.Pointer, cbv *bitvector, adjinfo *adjustinfo, f pp := (*uintptr)(add(scanp, i*sys.PtrSize)) retry: p := *pp - if f != nil && 0 < p && p < minLegalPointer && debug.invalidptr != 0 { + if f.valid() && 0 < p && p < minLegalPointer && debug.invalidptr != 0 { // Looks like a junk value in a pointer slot. // Live analysis wrong? getg().m.traceback = 2 @@ -713,7 +713,7 @@ func adjustframe(frame *stkframe, arg unsafe.Pointer) bool { if stackDebug >= 3 { print(" args\n") } - adjustpointers(unsafe.Pointer(frame.argp), &bv, adjinfo, nil) + adjustpointers(unsafe.Pointer(frame.argp), &bv, adjinfo, funcInfo{}) } return true } -- cgit v1.3