]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
runtime: ignore __morestack function in runtime.Callers
authorIan Lance Taylor <iant@golang.org>
Tue, 13 Sep 2022 17:33:20 +0000 (10:33 -0700)
committerIan Lance Taylor <iant@golang.org>
Tue, 13 Sep 2022 17:34:39 +0000 (10:34 -0700)
Backport from trunk.

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

libgo/runtime/go-callers.c

index 31783696a08231226d550be32e72d61224d27cfd..1d4dee662799c82290a473ead8e3bab0e534fe60 100644 (file)
@@ -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)