From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2116) id 7834D384F022; Wed, 7 Sep 2022 01:40:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7834D384F022 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662514816; bh=dAMKYeJ2vC+hQOizIONUCRNzp49gnrQJ/5pgIWpNY/k=; h=From:To:Subject:Date:From; b=GSI18dQ+Ir2aypQtUYQOZeM1Q46Ug4nCJJOv+6XQvEXVBBAm6fpKRP/9UmBCsj82y 3ii7hVR7JfKsyb8rLjbCpOp+LUK3gc8Ruw6TRPOW6Uj5bJIuY/ryyMGimxmEKpxixN eFlq6Rs+plwR8cKEh/7g84168cq7MIqLSLC9JcD0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Ian Lance Taylor To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-2505] runtime: ignore __morestack function in runtime.Callers X-Act-Checkin: gcc X-Git-Author: Ian Lance Taylor X-Git-Refname: refs/heads/master X-Git-Oldrev: 7a43e52a48b6403a99d3e8ab3105869b4b3c081e X-Git-Newrev: c0852b51b7a68ada822955eb7ef83d933cc33e47 Message-Id: <20220907014016.7834D384F022@sourceware.org> Date: Wed, 7 Sep 2022 01:40:16 +0000 (GMT) List-Id: https://gcc.gnu.org/g:c0852b51b7a68ada822955eb7ef83d933cc33e47 commit r13-2505-gc0852b51b7a68ada822955eb7ef83d933cc33e47 Author: Ian Lance Taylor Date: Sat Sep 3 10:37:07 2022 -0700 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: --- gcc/go/gofrontend/MERGE | 2 +- libgo/runtime/go-callers.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index ca797045d66..dce38e727a7 100644 --- 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 31783696a08..1d4dee66279 100644 --- 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)