From patchwork Sat Mar 4 00:58:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Peter Nilsson X-Patchwork-Id: 64117 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp706966wrd; Fri, 3 Mar 2023 16:59:05 -0800 (PST) X-Google-Smtp-Source: AK7set9oFDbsrpCCcBJ/hfGStLL+OiR/Evki+Zm88ZxoXAzTr9G9orKu7y3foZcihSbZCuovmjQt X-Received: by 2002:a17:907:a80f:b0:8b1:3a18:9daf with SMTP id vo15-20020a170907a80f00b008b13a189dafmr3524448ejc.74.1677891545670; Fri, 03 Mar 2023 16:59:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677891545; cv=none; d=google.com; s=arc-20160816; b=hrzqpCR6V+IzwF0/rs3W9AhG1LsrI1bCWlpK37xfb63p0DldwivIevK+o2qAJPltYz i+2zHuV0VidJgS8v7caupItuWOTXMpzVZ7fvqe5kDXiB3Lef1T+qdjX90a9HNPyBbRhH UfltwS/g12/CmgSUY0jhtgZxD0pLSJCcI4dr8E3TcOLzaRjMKflwIzhlD/fGQsjBEzCN HiGRvwy14DhX4Xu30/VqCITZTnoKlByERSEk9waR1X2MuX8YjBD3TeSbmrtivuJUslaj GfDMpnpfTy1ZXb/+030VSsbutnfZ6oD9jqwp1/oVQ2DAwtVYaOYNcKwAIxijbpQLQT4E ATUQ== 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:date:message-id :content-transfer-encoding:mime-version:subject:to:dmarc-filter :delivered-to:dkim-signature:dkim-filter; bh=NIa0Wf6Rc4HA3mSJyNbSg2OkjHoOw4spzjCmUmz2xuA=; b=kC72QeVuoCeIuVPFJtklWTtdYFIuMWeC/Y060qQGEECexqTGQTDO+X+ZrYjy2IASwp D75Qnump5V/fbVOReuf+VKSPUweWGPLwuP+ZSVfOjQmOuF6ImaaHl9YJWGd9wyE2YK1T paGJi2M87eeJXUqxF709A01+oQsCX01vr9cGz247EilKLHTzdKtwpWdce8M0iTAgyu31 ZYErxJ/GYeJWDhUoGHWRjKDAOCllx+7UUBMXQetcpVIc6L6XHK1E8Wks/gbttef5jK1a MnAcDTemvW2Ko46FBERTK5j1woONCyl8TryL103P/khKnvS/bMPo9NN4zUWkp1ndxTuv RKoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=VIAt8ZIM; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ay21-20020a170906d29500b008be2daad941si3751947ejb.648.2023.03.03.16.59.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 16:59:05 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=VIAt8ZIM; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 7A5EB3858D28 for ; Sat, 4 Mar 2023 00:59:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7A5EB3858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677891544; bh=NIa0Wf6Rc4HA3mSJyNbSg2OkjHoOw4spzjCmUmz2xuA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=VIAt8ZIMix6x6SuEetBtSR5bT5Ct20Hm04Xbjr8p445iblzVmvr5De15PVx23wucl E2MQkHYc1ZzuDZIeyBMHYr+JYiob19vViMtTfpqLBhn/nTXSGO3aRe9taY/7gQUqOG FveBuKlGFYl9JZ43VTVNi/U1dm4SQ3TD2Yp/y/sA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by sourceware.org (Postfix) with ESMTPS id 011D43858C74 for ; Sat, 4 Mar 2023 00:58:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 011D43858C74 To: Subject: [COMMITTED] testsuite: Fix various scan-assembler identifiers not handling _-prefix MIME-Version: 1.0 Message-ID: <20230304005801.3F69C20425@pchp3.se.axis.com> Date: Sat, 4 Mar 2023 01:58:01 +0100 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_PASS, SPF_PASS, TXREP 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: Hans-Peter Nilsson via Gcc-patches From: Hans-Peter Nilsson Reply-To: Hans-Peter Nilsson 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?1759396805596271188?= X-GMAIL-MSGID: =?utf-8?q?1759396805596271188?= Committed as obvious. -- >8 -- * g++.dg/cpp0x/pr84497.C: Handle USER_LABEL_PREFIX == "_" on scan-assembler identifiers. * gcc.dg/debug/btf/btf-enum64-1.c, gcc.dg/ipa/symver1.c: Ditto. --- gcc/testsuite/g++.dg/cpp0x/pr84497.C | 6 +++--- gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c | 6 +++--- gcc/testsuite/gcc.dg/ipa/symver1.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/testsuite/g++.dg/cpp0x/pr84497.C b/gcc/testsuite/g++.dg/cpp0x/pr84497.C index 7eb1aee474e3..be5a9d359ec5 100644 --- a/gcc/testsuite/g++.dg/cpp0x/pr84497.C +++ b/gcc/testsuite/g++.dg/cpp0x/pr84497.C @@ -34,6 +34,6 @@ extern thread_local Container container_obj; int main() { return !(&base_obj && &derived_obj && &container_obj);} #endif -// { dg-final { scan-assembler ".weak\[ \t\]*_ZTH8base_obj" } } -// { dg-final { scan-assembler ".weak\[ \t\]*_ZTH11derived_obj" } } -// { dg-final { scan-assembler ".weak\[ \t\]*_ZTH13container_obj" } } +// { dg-final { scan-assembler ".weak\[ \t\]*_?_ZTH8base_obj" } } +// { dg-final { scan-assembler ".weak\[ \t\]*_?_ZTH11derived_obj" } } +// { dg-final { scan-assembler ".weak\[ \t\]*_?_ZTH13container_obj" } } diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c index e443d4c8c00f..5d1487c1183a 100644 --- a/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c @@ -3,9 +3,9 @@ /* { dg-do compile } */ /* { dg-options "-O0 -gbtf -dA" } */ -/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum1,\[\t \]8" 1 } } */ -/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum2,\[\t \]8" 1 } } */ -/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum3,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]_?myenum1,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]_?myenum2,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]_?myenum3,\[\t \]8" 1 } } */ /* { dg-final { scan-assembler-times "\[\t \]0x13000003\[\t \]+\[^\n\]*btt_info" 2 } } */ /* { dg-final { scan-assembler-times "\[\t \]0x93000003\[\t \]+\[^\n\]*btt_info" 1 } } */ /* { dg-final { scan-assembler-times "\[\t \]0xffffffaa\[\t \]+\[^\n\]*bte_value_lo32" 2 } } */ diff --git a/gcc/testsuite/gcc.dg/ipa/symver1.c b/gcc/testsuite/gcc.dg/ipa/symver1.c index 2cd025836697..d120ed5d76b1 100644 --- a/gcc/testsuite/gcc.dg/ipa/symver1.c +++ b/gcc/testsuite/gcc.dg/ipa/symver1.c @@ -8,5 +8,5 @@ int foo() return 2; } -/* { dg-final { scan-assembler ".symver.*foo, foo@VER_2" } } */ -/* { dg-final { scan-assembler ".symver.*foo, foo@VER_3" } } */ +/* { dg-final { scan-assembler ".symver.*foo, _?foo@VER_2" } } */ +/* { dg-final { scan-assembler ".symver.*foo, _?foo@VER_3" } } */