From patchwork Wed Sep 7 01:40:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1053 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5044:0:0:0:0:0 with SMTP id h4csp919799wrt; Tue, 6 Sep 2022 18:41:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR62cxvUbivIcWtGackNiiaxgN4QHpBz7iEqQTPgq/HbvMyDXyGhw+3CG/bFBxn5ZPF8AAVe X-Received: by 2002:a17:906:974b:b0:733:10e:b940 with SMTP id o11-20020a170906974b00b00733010eb940mr785601ejy.326.1662514877707; Tue, 06 Sep 2022 18:41:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662514877; cv=none; d=google.com; s=arc-20160816; b=ofKyKMXIlCNv4da0KKbfro/8jBn5zUA6bJrhegB3qP/8pgp1otifv5w6Efb1Zyj5Ts NG7mIUmIy6Hl7RrrF3Z2Zi/hu0bvo6aC+NsVhfzXUnDaKJgjsAKQKUjDHZ4DZeppb964 J1FxqNEvLkyN95zlk9ztMNqF7PXzxa8aLHhCIW1M6jhteUPr09q8vm6CiSr7EceLJZU6 elMFmR2YS9lCPGRIg32Gadv2ctZPQWNLRfFsR7kVyu9rSJHcmqs3Qgn4VFjDQR9wVE0v rFIIKYgor1QDx2dYwkVMo7mmsEs9kaT2MbXoqu6cX3ANFjU2f/txSJCO0cEMTqvcJkXk bWew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:to:subject :message-id:date:mime-version:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=g/1VMSWNnulkf2c8oWu4k/3N+YwCxASAr4F6Pra8nuk=; b=c1IZBVfD32oD7KglSL6HoonxLN+1l+29jzeP/f1pROetIYfETNfz6OzoArPT+COUqr N2xFtPBz3lxIUCfp8hOe/L0LX37WUg8Zjla4MOnLDEnOkRRdy8aKzjCVH6pyvWlMDbc3 Q5r3W8IE4pSAmpph6SKZTRQetrgMpfPkL57IJcCSozIWoL4MwTrIfPKX1QnwbxkwHTFh bXuHslkqYE/0hO4whbd8jgOX56hEV4NoEJYEaX/z8TQfwZUwtrqhi1335SXWJcA8CpQy i3qR9Qw+c7bKSC1JZBaBiBGjxCdHTJdJFT47t4OFiOJ+h9iOMXR5a6Fexf1g5mvo4DCA k7YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="u+6M5H/C"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id bf26-20020a0564021a5a00b0044662581a68si9557110edb.442.2022.09.06.18.41.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 18:41:17 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="u+6M5H/C"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B41D23883030 for ; Wed, 7 Sep 2022 01:41:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B41D23883030 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662514876; bh=g/1VMSWNnulkf2c8oWu4k/3N+YwCxASAr4F6Pra8nuk=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=u+6M5H/CZ8EnIRLe0vt/HytAaB0ezG4KtBGKqcyw7PTgbU5z1WhA1XQYbUbcHqNEU EinKsJ/fJYV6krWbC3VIo7BlBkQ9m5Nm8rCs+/9flG1Cz6apajjdEvwz3pagAiwPBk RNWd2lEQ0bbwHU+mMs5aXFITYv5mO0gaqzEp0rtw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by sourceware.org (Postfix) with ESMTPS id 94CF6384F022 for ; Wed, 7 Sep 2022 01:40:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 94CF6384F022 Received: by mail-pl1-x633.google.com with SMTP id f24so13052835plr.1 for ; Tue, 06 Sep 2022 18:40:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date; bh=g/1VMSWNnulkf2c8oWu4k/3N+YwCxASAr4F6Pra8nuk=; b=D3oS9Hc8wrRb8rIoNLMbujHY2LjLzwFzKQKZ+V3jc0XZ4G08u1r7Rzda0va3gCzOS7 lOq2/Xa3OB1IYLIjCB44Nkpu9ojqu/bRrQhHqVvWpBlWFmuRN4Gi09m9u/fYmXI5K5X7 /6BpWyuPAalVZ8xPgbLNZh+ztEYZODUx/NTmff2k4JIt22cySeqodKhP5sLU8d610VbV eNo1QXlNZibVwPbWDNdcEp1fPVVifFYSILE6hLUSrxQtmGRHxOjc95gTCvVlhUYZ91t6 dc8qRmXhTae11FjvCNgn+GHZ6KVTycRXcA7Sdw+kUyd/Hsyw+TdY+ypDUUrU9FPxoKb9 Z5+g== X-Gm-Message-State: ACgBeo30zmNEAgXqcQXMRtoFCCVAWwurpNvEm3xhfeql6hrQmJqL7P7r MY2z3Mz1Bw3GH01EqakHVSvlfewWI7CLAadPBE56zsFO5yXPuAXd X-Received: by 2002:a17:90b:4b47:b0:1f7:2e06:5752 with SMTP id mi7-20020a17090b4b4700b001f72e065752mr1325515pjb.187.1662514832276; Tue, 06 Sep 2022 18:40:32 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 6 Sep 2022 18:40:20 -0700 Message-ID: Subject: libgo patch committed: Ignore __morestack in runtime.Callers To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ian Lance Taylor via Gcc-patches From: Ian Lance Taylor Reply-To: Ian Lance Taylor Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1743273200165810023?= X-GMAIL-MSGID: =?utf-8?q?1743273200165810023?= This libgo patch ignores the __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. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian c0852b51b7a68ada822955eb7ef83d933cc33e47 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)