diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-02-15 13:54:45 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-02-15 13:54:45 +0000 |
| commit | d86dd2490f8956c764021f594d99d16b3dca81e0 (patch) | |
| tree | 0d35b0e658a31024f017642d892499bf8aa475e1 | |
| parent | 2dca0c882ade0f0a5f2e283a6d830721ba2eb90e (diff) | |
| download | gcc-d86dd2490f8956c764021f594d99d16b3dca81e0.zip gcc-d86dd2490f8956c764021f594d99d16b3dca81e0.tar.gz gcc-d86dd2490f8956c764021f594d99d16b3dca81e0.tar.bz2 | |
runtime: add type cast for non-split-stack calls to scanstackblock
Reviewed-on: https://go-review.googlesource.com/c/162884
From-SVN: r268939
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/stack.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 4b603d9..993916e 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -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. diff --git a/libgo/runtime/stack.c b/libgo/runtime/stack.c index be5e523..aff8dd5 100644 --- a/libgo/runtime/stack.c +++ b/libgo/runtime/stack.c @@ -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; |