diff options
| author | Russ Cox <rsc@golang.org> | 2014-09-12 07:29:19 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-09-12 07:29:19 -0400 |
| commit | e29b65c88377fb1d9100430df53b765b6197cc65 (patch) | |
| tree | 1d8fc0d2b169f44da2858dc46b5f059f33fbc863 /src/reflect/asm_arm.s | |
| parent | f671f288150424d52f06b316eb28439838f82294 (diff) | |
| download | go-e29b65c88377fb1d9100430df53b765b6197cc65.tar.gz | |
runtime: look up arg stackmap for makeFuncStub/methodValueStub during traceback
makeFuncStub and methodValueStub are used by reflect as
generic function implementations. Each call might have
different arguments. Extract those arguments from the
closure data instead of assuming it is the same each time.
Because the argument map is now being extracted from the
function itself, we don't need the special cases in reflect.Call
anymore, so delete those.
Fixes an occasional crash seen when stack copying does
not update makeFuncStub's arguments correctly.
Will also help make it safe to require stack maps in the
garbage collector.
Derived from CL 142000044 by khr.
LGTM=khr
R=khr
CC=golang-codereviews
https://codereview.appspot.com/143890044
Diffstat (limited to 'src/reflect/asm_arm.s')
| -rw-r--r-- | src/reflect/asm_arm.s | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/reflect/asm_arm.s b/src/reflect/asm_arm.s index 6bd5d48ec..5a14c6f81 100644 --- a/src/reflect/asm_arm.s +++ b/src/reflect/asm_arm.s @@ -3,12 +3,14 @@ // license that can be found in the LICENSE file. #include "textflag.h" +#include "funcdata.h" // makeFuncStub is jumped to by the code generated by MakeFunc. // See the comment on the declaration of makeFuncStub in makefunc.go // for more details. // No argsize here, gc generates argsize info at call site. TEXT ·makeFuncStub(SB),(NOSPLIT|WRAPPER),$8 + NO_LOCAL_POINTERS MOVW R7, 4(R13) MOVW $argframe+0(FP), R1 MOVW R1, 8(R13) @@ -20,6 +22,7 @@ TEXT ·makeFuncStub(SB),(NOSPLIT|WRAPPER),$8 // for more details. // No argsize here, gc generates argsize info at call site. TEXT ·methodValueCall(SB),(NOSPLIT|WRAPPER),$8 + NO_LOCAL_POINTERS MOVW R7, 4(R13) MOVW $argframe+0(FP), R1 MOVW R1, 8(R13) |