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/mbitmap.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/runtime/mbitmap.go') diff --git a/src/runtime/mbitmap.go b/src/runtime/mbitmap.go index 7bead96904..3e782f50da 100644 --- a/src/runtime/mbitmap.go +++ b/src/runtime/mbitmap.go @@ -1877,7 +1877,7 @@ func getgcmask(ep interface{}) (mask []byte) { frame.sp = uintptr(p) _g_ := getg() gentraceback(_g_.m.curg.sched.pc, _g_.m.curg.sched.sp, 0, _g_.m.curg, 0, nil, 1000, getgcmaskcb, noescape(unsafe.Pointer(&frame)), 0) - if frame.fn != nil { + if frame.fn.valid() { f := frame.fn targetpc := frame.continpc if targetpc == 0 { -- cgit v1.3-5-g45d5