Skip to content

Commit 0752bc8

Browse files
committed
[release-branch.go1.3] runtime: fix nacl amd64p32 flakiness
««« 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
1 parent 329d3ce commit 0752bc8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/pkg/runtime/traceback_x86.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ runtime·gentraceback(uintptr pc0, uintptr sp0, uintptr lr0, G *gp, int32 skip,
214214
// the SP is two words lower than normal.
215215
sparg = frame.sp;
216216
if(wasnewproc)
217-
sparg += 2*sizeof(uintreg);
217+
sparg += 2*sizeof(uintptr);
218218

219219
// Determine frame's 'continuation PC', where it can continue.
220220
// Normally this is the return address on the stack, but if sigpanic

0 commit comments

Comments
 (0)