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: 1751689 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=RVe7fX9/; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PT60Y2gj3z23j7 for ; Sat, 4 Mar 2023 11:58:35 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E353D3858025 for ; Sat, 4 Mar 2023 00:58:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E353D3858025 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677891512; bh=NIa0Wf6Rc4HA3mSJyNbSg2OkjHoOw4spzjCmUmz2xuA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=RVe7fX9/zgtAfKecvpwKVPlSnrPYK4pbA7VkzDlL6/xem55viRqMzXmD2MArwQGte cmlUdtX4TWez3vE1ZstJFSXYPIi49rHhrwfIe3vcQGa2ZZhTJ0n9OBA4HbWPb5vUDk DJaWp9drtthSGFzcNmFR8gsu2wtsyDpxRrvHmRlE= 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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" } } */