From 0752bc8f26dffccbe536aaa7a5131ca26477c0d6 Mon Sep 17 00:00:00 2001 From: Andrew Gerrand Date: Tue, 12 Aug 2014 09:29:29 +1000 Subject: [release-branch.go1.3] runtime: fix nacl amd64p32 flakiness MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ««« CL 102710043 / 5640e19d768d runtime: fix nacl amd64p32 flakiness newproc takes two extra pointers, not two extra registers. On amd64p32 (nacl) they are different. We diagnosed this before the 1.3 cut but the tree was frozen. I believe this is causing the random problems on the builder. Fixes #8199. TBR=r CC=golang-codereviews https://golang.org/cl/102710043 »»» TBR=rsc CC=golang-codereviews https://golang.org/cl/124120044 --- src/pkg/runtime/traceback_x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pkg/runtime/traceback_x86.c b/src/pkg/runtime/traceback_x86.c index 851504f529..7359cfcc96 100644 --- a/src/pkg/runtime/traceback_x86.c +++ b/src/pkg/runtime/traceback_x86.c @@ -214,7 +214,7 @@ runtime·gentraceback(uintptr pc0, uintptr sp0, uintptr lr0, G *gp, int32 skip, // the SP is two words lower than normal. sparg = frame.sp; if(wasnewproc) - sparg += 2*sizeof(uintreg); + sparg += 2*sizeof(uintptr); // Determine frame's 'continuation PC', where it can continue. // Normally this is the return address on the stack, but if sigpanic -- cgit v1.2.3-54-g00ecf