PR go/69511

    runtime: change G gcstack_size field to size_t

    Because its address is passed to __splitstack_find, which expects size_t*.

    From Dominik Vogt in GCC PR 69511.

    Reviewed-on: https://go-review.googlesource.com/19429

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233260 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 1f47b1e269b0ed3393b86b24301cb66ab57ed226..23f1bfeaa9fa17efe28b39f6f5276d6574e9b0c7 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-2ef5f1ca449b5cf07dbbd7b13a50910fb5567372
+4cec4c5db5b054c5536ec5c50ee7aebec83563bc
 
 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/proc.c b/libgo/runtime/proc.c
index c25a21731abf00f9c2c93b8b4548837bde3e9508..cd926b4ea62e19bfff9ae7b9007e43767ce1f2b3 100644 (file)
--- a/libgo/runtime/proc.c
+++ b/libgo/runtime/proc.c
@@ -2267,7 +2267,7 @@ runtime_malg(int32 stacksize, byte** ret_stack, size_t* ret_stacksize)
                }
                *ret_stacksize = stacksize;
                newg->gcinitial_sp = *ret_stack;
-               newg->gcstack_size = stacksize;
+               newg->gcstack_size = (size_t)stacksize;
 #endif
        }
        return newg;

diff --git a/libgo/runtime/runtime.h b/libgo/runtime/runtime.h
index 67242291db7b2182eb6b2ebef496a7d616f782bd..34143e9a256f54a16fcd588f8540880a8642702e 100644 (file)
--- a/libgo/runtime/runtime.h
+++ b/libgo/runtime/runtime.h
@@ -200,7 +200,7 @@ struct      G
        void*   exception;      // current exception being thrown
        bool    is_foreign;     // whether current exception from other language
        void    *gcstack;       // if status==Gsyscall, gcstack = stackbase to use during gc
-       uintptr gcstack_size;
+       size_t  gcstack_size;
        void*   gcnext_segment;
        void*   gcnext_sp;
        void*   gcinitial_sp;