runtime: ignore __morestack function in runtime.Callers

We were ignoring all functions starting with "__morestack_", but not
the function "__morestack" itself.  Without this change, some tests
such as recover.go started failing recently, though I'm not sure
exactly what changed.

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/427935

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ca797045d661c2af9d814057feb56c73b842b84b..dce38e727a7acef49b2ce76aa745b5031afd251e 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-d53e8a0e94e34dc609e34dd5e404debda2640cfb
+6543b7fc6da533eb976b37649a925e7fd5a521fa
 
 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/go-callers.c b/libgo/runtime/go-callers.c
index 31783696a08231226d550be32e72d61224d27cfd..1d4dee662799c82290a473ead8e3bab0e534fe60 100644 (file)
--- a/libgo/runtime/go-callers.c
+++ b/libgo/runtime/go-callers.c
@@ -107,7 +107,7 @@ callback (void *data, uintptr_t pc, const char *filename, int lineno,
       p = function;
       if (__builtin_strncmp (p, "___", 3) == 0)
        ++p;
-      if (__builtin_strncmp (p, "__morestack_", 12) == 0)
+      if (__builtin_strncmp (p, "__morestack", 11) == 0)
        return 0;
     }
   else if (filename != NULL)