From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 15 Feb 2019 13:54:45 +0000 (+0000)
Subject: runtime: add type cast for non-split-stack calls to scanstackblock
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d86dd2490f8956c764021f594d99d16b3dca81e0;p=gcc.git

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

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

From-SVN: r268939
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 4b603d994fd..993916e9b68 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 be5e52363d2..aff8dd524a4 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;