From patchwork Fri Dec 22 00:19:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1879485 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WnkO7kxb; dkim-atps=neutral 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=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Sx7HC4HcKz1ySd for ; Fri, 22 Dec 2023 11:20:21 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 41E9D38618F5 for ; Fri, 22 Dec 2023 00:20:19 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id AFC0D3858C56 for ; Fri, 22 Dec 2023 00:19:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AFC0D3858C56 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AFC0D3858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703204398; cv=none; b=nHookamWWHPlUqOAr1dlVogOuBKBAPtVzGEgBOXv+WdcJUTUgEK9mM0tOL4c5Q+vfYaf7cr4h+QT8tnxx7AkG/xZxPFkLF6uvjt9IAveBJeXlef6pnXRo22Zhcc7JLOUVACJruwEAVBPORBL24L3rywzRrUiz/W01S5ncuyf3ow= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703204398; c=relaxed/simple; bh=8ZF+xLrtdCW1o4W6IS+x979eSG6bU7PQ5XGx6yGaZxc=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=EYbe2kCl4oW3qt3zGfDmGZhA78Rmba+CrarQzPkcFU+ogOCUGlugOpTIzinUWDyOORkPjI/drcVwIPt4UgQt8J7v5Hi0Oh7ZbAJEFnteHhieqEF6IvpJOnu6s/+cBAj8ynVkAlgV4nG5neS9SdkWIw60cdoLruKxKIi/QvPGH2s= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703204392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yYai3jgu4cHkLlDsBeAI+mmCZ8Za8xIJ5HQCVU3U/W0=; b=WnkO7kxbg9J0zBlbIGsSgU7AcLVtLZP4RrntlyHTtl1ZyocyftwL9pVAY/mCR7SITyZavn jO06/8ZU9Q8kOeMTYXseASRJxgottSVTnYE2Clz7g33ucyZGs8aA0IXo53PqTucCfrXlQR PvyVVW3XW32MciDSUb/1OKZVGnLcOOc= Received: from mail-oa1-f70.google.com (mail-oa1-f70.google.com [209.85.160.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-346-sx41HfpGO5CiB9Wo_hYtug-1; Thu, 21 Dec 2023 19:19:50 -0500 X-MC-Unique: sx41HfpGO5CiB9Wo_hYtug-1 Received: by mail-oa1-f70.google.com with SMTP id 586e51a60fabf-203e21d9a16so1399213fac.3 for ; Thu, 21 Dec 2023 16:19:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703204389; x=1703809189; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UQ9dulySNeb5SrRaGdxBQymnwBsfaxsdyvZ0c8UB9A4=; b=MgZQ/PRixokaWPZAzGa762xUD+5KvLynF50+ZQUj3NZWGFF9uV/yCDJttw9J1WUxxg xrW3VRhJo9IPTuxZkDmOaKK16XG6uF+XWrSfWaOZyo0vp1oAIstJV/52Su4FdC2ewSPw XsMWMi6lvDEFWVCaUWbd2IkdK198odTbQheiwWqN/5d0Rwlxhk+rZXQJE1wdckq/SXGS OBovLUw5nv6qcUC/iDQaZs+yBpX5evWc2vBQexSuNeJb8szxWMcCtcwuvTmSho8BlyAj tQYkXokn44SaRVENJvX6EsoclyfAuHC2YusUpPB6b89NzRbcVLb6g0tmayNw51OUiBew S4sQ== X-Gm-Message-State: AOJu0Yx2tgohUjmfoeWmxvYkfY1T52whRH5pkmD3Dedl4cItdNexwX4G AWD2P/o4Mljs050COkb9KRqqdkqKjW9vxIoDhkhv0h/wiZd69Dzwj3YyoEaRSVrG6O1lvKIOPlA dMkmFq67l1gm2h1BvB3cPokUmwTN8pVO0etBFLycImNW0Owww9RyUY4jt202NqFBSNHwvLRl3wd ewP7FzOg== X-Received: by 2002:a05:6871:68a:b0:203:e346:b8ec with SMTP id l10-20020a056871068a00b00203e346b8ecmr703893oao.85.1703204389296; Thu, 21 Dec 2023 16:19:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IEjqfSdp5pKGeGm+nnAogyVnp5itULNLF1bXqf5kpGetFXnvKzk7+CCw7BTa3Zb/RrObY7wtQ== X-Received: by 2002:a05:6871:68a:b0:203:e346:b8ec with SMTP id l10-20020a056871068a00b00203e346b8ecmr703870oao.85.1703204388522; Thu, 21 Dec 2023 16:19:48 -0800 (PST) Received: from jason.com (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id b16-20020a05620a127000b0077f05db2663sm1004413qkl.66.2023.12.21.16.19.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 16:19:47 -0800 (PST) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed] testsuite: suppress mangling compatibility aliases Date: Thu, 21 Dec 2023 19:19:45 -0500 Message-Id: <20231222001945.3536355-1-jason@redhat.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- Recently a mangling test failed on a target with no mangling alias support because I hadn't updated the expected mangling, but it was still passing on x86_64-pc-linux-gnu because of the alias for the old mangling. So let's avoid these aliases in mangling tests. gcc/testsuite/ChangeLog: * g++.dg/abi/mangle-arm-crypto.C: Specify -fabi-compat-version. * g++.dg/abi/mangle-concepts1.C * g++.dg/abi/mangle-neon-aarch64.C * g++.dg/abi/mangle-neon.C * g++.dg/abi/mangle-regparm.C * g++.dg/abi/mangle-regparm1a.C * g++.dg/abi/mangle-ttp1.C * g++.dg/abi/mangle-union1.C * g++.dg/abi/mangle1.C * g++.dg/abi/mangle13.C * g++.dg/abi/mangle15.C * g++.dg/abi/mangle16.C * g++.dg/abi/mangle18-1.C * g++.dg/abi/mangle19-1.C * g++.dg/abi/mangle20-1.C * g++.dg/abi/mangle22.C * g++.dg/abi/mangle23.C * g++.dg/abi/mangle24.C * g++.dg/abi/mangle25.C * g++.dg/abi/mangle26.C * g++.dg/abi/mangle27.C * g++.dg/abi/mangle28.C * g++.dg/abi/mangle29.C * g++.dg/abi/mangle3-2.C * g++.dg/abi/mangle3.C * g++.dg/abi/mangle30.C * g++.dg/abi/mangle31.C * g++.dg/abi/mangle32.C * g++.dg/abi/mangle33.C * g++.dg/abi/mangle34.C * g++.dg/abi/mangle35.C * g++.dg/abi/mangle36.C * g++.dg/abi/mangle37.C * g++.dg/abi/mangle39.C * g++.dg/abi/mangle40.C * g++.dg/abi/mangle43.C * g++.dg/abi/mangle44.C * g++.dg/abi/mangle45.C * g++.dg/abi/mangle46.C * g++.dg/abi/mangle47.C * g++.dg/abi/mangle48.C * g++.dg/abi/mangle49.C * g++.dg/abi/mangle5.C * g++.dg/abi/mangle50.C * g++.dg/abi/mangle51.C * g++.dg/abi/mangle52.C * g++.dg/abi/mangle53.C * g++.dg/abi/mangle54.C * g++.dg/abi/mangle55.C * g++.dg/abi/mangle56.C * g++.dg/abi/mangle57.C * g++.dg/abi/mangle58.C * g++.dg/abi/mangle59.C * g++.dg/abi/mangle6.C * g++.dg/abi/mangle60.C * g++.dg/abi/mangle61.C * g++.dg/abi/mangle62.C * g++.dg/abi/mangle62a.C * g++.dg/abi/mangle63.C * g++.dg/abi/mangle64.C * g++.dg/abi/mangle65.C * g++.dg/abi/mangle66.C * g++.dg/abi/mangle68.C * g++.dg/abi/mangle69.C * g++.dg/abi/mangle7.C * g++.dg/abi/mangle70.C * g++.dg/abi/mangle71.C * g++.dg/abi/mangle72.C * g++.dg/abi/mangle73.C * g++.dg/abi/mangle74.C * g++.dg/abi/mangle75.C * g++.dg/abi/mangle76.C * g++.dg/abi/mangle77.C * g++.dg/abi/mangle78.C * g++.dg/abi/mangle8.C * g++.dg/abi/mangle9.C: Likewise. --- gcc/testsuite/g++.dg/abi/mangle-arm-crypto.C | 1 + gcc/testsuite/g++.dg/abi/mangle-concepts1.C | 1 + gcc/testsuite/g++.dg/abi/mangle-neon-aarch64.C | 1 + gcc/testsuite/g++.dg/abi/mangle-neon.C | 1 + gcc/testsuite/g++.dg/abi/mangle-regparm.C | 2 +- gcc/testsuite/g++.dg/abi/mangle-regparm1a.C | 2 +- gcc/testsuite/g++.dg/abi/mangle-ttp1.C | 1 + gcc/testsuite/g++.dg/abi/mangle-union1.C | 1 + gcc/testsuite/g++.dg/abi/mangle1.C | 2 +- gcc/testsuite/g++.dg/abi/mangle13.C | 2 +- gcc/testsuite/g++.dg/abi/mangle15.C | 2 +- gcc/testsuite/g++.dg/abi/mangle16.C | 2 +- gcc/testsuite/g++.dg/abi/mangle18-1.C | 2 +- gcc/testsuite/g++.dg/abi/mangle19-1.C | 2 +- gcc/testsuite/g++.dg/abi/mangle20-1.C | 2 +- gcc/testsuite/g++.dg/abi/mangle22.C | 2 +- gcc/testsuite/g++.dg/abi/mangle23.C | 2 +- gcc/testsuite/g++.dg/abi/mangle24.C | 2 +- gcc/testsuite/g++.dg/abi/mangle25.C | 2 +- gcc/testsuite/g++.dg/abi/mangle26.C | 2 +- gcc/testsuite/g++.dg/abi/mangle27.C | 2 +- gcc/testsuite/g++.dg/abi/mangle28.C | 2 +- gcc/testsuite/g++.dg/abi/mangle29.C | 2 +- gcc/testsuite/g++.dg/abi/mangle3-2.C | 2 +- gcc/testsuite/g++.dg/abi/mangle3.C | 2 +- gcc/testsuite/g++.dg/abi/mangle30.C | 1 + gcc/testsuite/g++.dg/abi/mangle31.C | 1 + gcc/testsuite/g++.dg/abi/mangle32.C | 1 + gcc/testsuite/g++.dg/abi/mangle33.C | 1 + gcc/testsuite/g++.dg/abi/mangle34.C | 1 + gcc/testsuite/g++.dg/abi/mangle35.C | 1 + gcc/testsuite/g++.dg/abi/mangle36.C | 2 +- gcc/testsuite/g++.dg/abi/mangle37.C | 2 +- gcc/testsuite/g++.dg/abi/mangle39.C | 2 +- gcc/testsuite/g++.dg/abi/mangle40.C | 2 +- gcc/testsuite/g++.dg/abi/mangle43.C | 2 +- gcc/testsuite/g++.dg/abi/mangle44.C | 1 + gcc/testsuite/g++.dg/abi/mangle45.C | 2 +- gcc/testsuite/g++.dg/abi/mangle46.C | 2 +- gcc/testsuite/g++.dg/abi/mangle47.C | 1 + gcc/testsuite/g++.dg/abi/mangle48.C | 1 + gcc/testsuite/g++.dg/abi/mangle49.C | 2 +- gcc/testsuite/g++.dg/abi/mangle5.C | 1 + gcc/testsuite/g++.dg/abi/mangle50.C | 1 + gcc/testsuite/g++.dg/abi/mangle51.C | 2 +- gcc/testsuite/g++.dg/abi/mangle52.C | 2 +- gcc/testsuite/g++.dg/abi/mangle53.C | 1 + gcc/testsuite/g++.dg/abi/mangle54.C | 2 +- gcc/testsuite/g++.dg/abi/mangle55.C | 1 + gcc/testsuite/g++.dg/abi/mangle56.C | 1 + gcc/testsuite/g++.dg/abi/mangle57.C | 2 +- gcc/testsuite/g++.dg/abi/mangle58.C | 2 +- gcc/testsuite/g++.dg/abi/mangle59.C | 2 +- gcc/testsuite/g++.dg/abi/mangle6.C | 1 + gcc/testsuite/g++.dg/abi/mangle60.C | 2 +- gcc/testsuite/g++.dg/abi/mangle61.C | 1 + gcc/testsuite/g++.dg/abi/mangle62.C | 2 +- gcc/testsuite/g++.dg/abi/mangle62a.C | 2 +- gcc/testsuite/g++.dg/abi/mangle63.C | 1 + gcc/testsuite/g++.dg/abi/mangle64.C | 2 +- gcc/testsuite/g++.dg/abi/mangle65.C | 1 + gcc/testsuite/g++.dg/abi/mangle66.C | 1 + gcc/testsuite/g++.dg/abi/mangle68.C | 1 + gcc/testsuite/g++.dg/abi/mangle69.C | 1 + gcc/testsuite/g++.dg/abi/mangle7.C | 1 + gcc/testsuite/g++.dg/abi/mangle70.C | 1 + gcc/testsuite/g++.dg/abi/mangle71.C | 1 + gcc/testsuite/g++.dg/abi/mangle72.C | 1 + gcc/testsuite/g++.dg/abi/mangle73.C | 1 + gcc/testsuite/g++.dg/abi/mangle74.C | 2 +- gcc/testsuite/g++.dg/abi/mangle75.C | 1 + gcc/testsuite/g++.dg/abi/mangle76.C | 2 +- gcc/testsuite/g++.dg/abi/mangle77.C | 1 + gcc/testsuite/g++.dg/abi/mangle78.C | 1 + gcc/testsuite/g++.dg/abi/mangle8.C | 1 + gcc/testsuite/g++.dg/abi/mangle9.C | 2 +- 76 files changed, 76 insertions(+), 40 deletions(-) base-commit: cdfaa4aa52752e55d27bb068b6de933d17b176d3 diff --git a/gcc/testsuite/g++.dg/abi/mangle-arm-crypto.C b/gcc/testsuite/g++.dg/abi/mangle-arm-crypto.C index f3fb1a96601..1d3f832f8a1 100644 --- a/gcc/testsuite/g++.dg/abi/mangle-arm-crypto.C +++ b/gcc/testsuite/g++.dg/abi/mangle-arm-crypto.C @@ -4,6 +4,7 @@ // { dg-do compile } // { dg-require-effective-target arm_crypto_ok } // { dg-add-options arm_crypto } +// { dg-additional-options -fabi-compat-version=0 } #include diff --git a/gcc/testsuite/g++.dg/abi/mangle-concepts1.C b/gcc/testsuite/g++.dg/abi/mangle-concepts1.C index eac520cef3c..cb3396b663a 100644 --- a/gcc/testsuite/g++.dg/abi/mangle-concepts1.C +++ b/gcc/testsuite/g++.dg/abi/mangle-concepts1.C @@ -1,4 +1,5 @@ // { dg-do compile { target c++20 } } +// { dg-additional-options -fabi-compat-version=0 } template concept C = true; template concept C2 = true; diff --git a/gcc/testsuite/g++.dg/abi/mangle-neon-aarch64.C b/gcc/testsuite/g++.dg/abi/mangle-neon-aarch64.C index 50c1452ed83..b62cf5dd49e 100644 --- a/gcc/testsuite/g++.dg/abi/mangle-neon-aarch64.C +++ b/gcc/testsuite/g++.dg/abi/mangle-neon-aarch64.C @@ -2,6 +2,7 @@ // correctly. // { dg-do compile { target { aarch64*-*-* } } } +// { dg-additional-options -fabi-compat-version=0 } #include diff --git a/gcc/testsuite/g++.dg/abi/mangle-neon.C b/gcc/testsuite/g++.dg/abi/mangle-neon.C index 57a9db26922..1ab51d5a78a 100644 --- a/gcc/testsuite/g++.dg/abi/mangle-neon.C +++ b/gcc/testsuite/g++.dg/abi/mangle-neon.C @@ -3,6 +3,7 @@ // { dg-do compile } // { dg-require-effective-target arm_neon_ok } // { dg-add-options arm_neon } +// { dg-additional-options -fabi-compat-version=0 } #include diff --git a/gcc/testsuite/g++.dg/abi/mangle-regparm.C b/gcc/testsuite/g++.dg/abi/mangle-regparm.C index 361e38bd3f3..480b5fa6f1d 100644 --- a/gcc/testsuite/g++.dg/abi/mangle-regparm.C +++ b/gcc/testsuite/g++.dg/abi/mangle-regparm.C @@ -1,5 +1,5 @@ // { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } -// { dg-options "-Wabi=8 -save-temps" } +// { dg-options "-Wabi=8 -save-temps -fabi-compat-version=0" } // { dg-final { scan-assembler "_Z18IndirectExternCallIPU7stdcallU7regparmILi3EEFviiEiEvT_T0_S3_" } } typedef __SIZE_TYPE__ size_t; diff --git a/gcc/testsuite/g++.dg/abi/mangle-regparm1a.C b/gcc/testsuite/g++.dg/abi/mangle-regparm1a.C index bfa6c9b0039..60ac51e1ff3 100644 --- a/gcc/testsuite/g++.dg/abi/mangle-regparm1a.C +++ b/gcc/testsuite/g++.dg/abi/mangle-regparm1a.C @@ -1,5 +1,5 @@ // { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } -// { dg-options "-fabi-version=8 -Wabi -save-temps" } +// { dg-options "-fabi-version=8 -fabi-compat-version=8 -Wabi -save-temps" } // { dg-final { scan-assembler "_Z18IndirectExternCallIPFviiEiEvT_T0_S3_" } } template diff --git a/gcc/testsuite/g++.dg/abi/mangle-ttp1.C b/gcc/testsuite/g++.dg/abi/mangle-ttp1.C index 2f5878fc3fe..0c3660dd79e 100644 --- a/gcc/testsuite/g++.dg/abi/mangle-ttp1.C +++ b/gcc/testsuite/g++.dg/abi/mangle-ttp1.C @@ -1,5 +1,6 @@ // ABI #47 "natural" template parameter mangling // { dg-do compile { target c++17 } } +// { dg-additional-options -fabi-compat-version=0 } template