procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

runtime: add type cast for non-split-stack calls to scanstackblock

Browse source 
Reviewed-on: https://go-review.googlesource.com/c/162884

From-SVN: r268939
This commit is contained in:
Ian Lance Taylor 2019-02-15 13:54:45 +00:00
parent 2dca0c882a
commit d86dd2490f
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View file

@ -1,4 +1,4 @@
03e28273a4fcb114f5204d52ed107591404002f4
a9c1a76e14b66a356d3c3dfb50f1e6138e97733c
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

8
libgo/runtime/stack.c
View file

@ -110,15 +110,15 @@ static bool doscanstack1(G *gp, void *gcw) {
}
top = (byte*)(void*)(gp->gcinitialsp) + gp->gcstacksize;
if(top > bottom)
scanstackblock(bottom, (uintptr)(top - bottom), gcw);
scanstackblock((uintptr)(bottom), (uintptr)(top - bottom), gcw);
else
scanstackblock(top, (uintptr)(bottom - top), gcw);
scanstackblock((uintptr)(top), (uintptr)(bottom - top), gcw);
if (nextsp2 != nil) {
initialsp2 = (byte*)(void*)(gp->gcinitialsp2);
if(initialsp2 > nextsp2)
scanstackblock(nextsp2, (uintptr)(initialsp2 - nextsp2), gcw);
scanstackblock((uintptr)(nextsp2), (uintptr)(initialsp2 - nextsp2), gcw);
else
scanstackblock(initialsp2, (uintptr)(nextsp2 - initialsp2), gcw);
scanstackblock((uintptr)(initialsp2), (uintptr)(nextsp2 - initialsp2), gcw);
}
#endif
return true;