From efdb1813a0f65b04fdfe9982b68f4f6d31eda277 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sun, 16 Oct 2016 18:23:39 -0400 Subject: [release-branch.go1.7] runtime: fix getArgInfo for deferred reflection calls Fixes #18333 (backport) getArgInfo for reflect.makeFuncStub and reflect.methodValueCall is necessarily special. These have dynamically determined argument maps that are stored in their context (that is, their *funcval). These functions are written to store this context at 0(SP) when called, and getArgInfo retrieves it from there. This technique works if getArgInfo is passed an active call frame for one of these functions. However, getArgInfo is also used in tracebackdefers, where the "call" is not a true call with an active stack frame, but a deferred call. In this situation, getArgInfo currently crashes because tracebackdefers passes a frame with sp set to 0. However, the entire approach used by getArgInfo is flawed in this situation because the wrapper has not actually executed, and hence hasn't saved this metadata to any stack frame. In the defer case, we know the *funcval from the _defer itself, so we can fix this by teaching getArgInfo to use the *funcval context directly when its available, and otherwise get it from the active call frame. While we're here, this commit simplifies getArgInfo a bit by making it play more nicely with the type system. Rather than decoding the *reflect.methodValue that is the wrapper's context as a *[2]uintptr, just write out a copy of the reflect.methodValue type in the runtime. Fixes #16331. Fixes #17471. Change-Id: I81db4d985179b4a81c68c490cceeccbfc675456a Reviewed-on: https://go-review.googlesource.com/31138 Run-TryBot: Austin Clements TryBot-Result: Gobot Gobot Reviewed-by: Keith Randall Reviewed-on: https://go-review.googlesource.com/35638 Run-TryBot: Brad Fitzpatrick Reviewed-by: Austin Clements --- src/reflect/makefunc.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/reflect/makefunc.go') diff --git a/src/reflect/makefunc.go b/src/reflect/makefunc.go index ad2ebd0de9..a7efeb8262 100644 --- a/src/reflect/makefunc.go +++ b/src/reflect/makefunc.go @@ -70,6 +70,8 @@ func MakeFunc(typ Type, fn func(args []Value) (results []Value)) Value { // word in the passed-in argument frame. func makeFuncStub() +// This type is partially duplicated as runtime.reflectMethodValue. +// Any changes should be reflected in both. type methodValue struct { fn uintptr stack *bitVector // stack bitmap for args - offset known to runtime -- cgit v1.3