From patchwork Wed Apr 24 16:16:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 1927278 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=RcAz+GsH; 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 4VPkfF0wyNz1yP2 for ; Thu, 25 Apr 2024 02:17:24 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9B4733849AD5 for ; Wed, 24 Apr 2024 16:17:22 +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 57703385840D for ; Wed, 24 Apr 2024 16:16:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 57703385840D 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 57703385840D 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=1713975419; cv=none; b=IHuqI0dp2B76z31Kj1g3XXCSBEW9sPDbm/L/EpdJFHPzXMTzsvqkKrWU/TbybaAR8Y0nCtDFZEEN0he7OjuB/9MFx6aG9Jzlc2nAL67hZNiNk9D80HUHkAxgB7UEXPzb2qghwj+ft+LBlEIw7h6+5xqqfEvq0Bd4F9Pv0+HN3p4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713975419; c=relaxed/simple; bh=rITxnVy/SqYCMNjOMlN17yDkMsTfzCmX4xTUa4/URRI=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=OKAY8DRIgv/qNv/ZePaxvPeBgeZVQemIXUAU4G1Ge2UCjNtvLETuB1ebgOJY+VZJpgf5DBXOjF1QSTuj8p9F9RCyY2vwKY/427BJtUgNNmNESEkXrN+qEndCEJ/Uxp5COIKPH0uZX2luUqd9Y6OB0GU0WcvCuyTzAcklEjTUGEI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713975416; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=3hZ4Af5FjEmNcF/lI6ns10XiL8wQ0PVKtuD/4iIRUcQ=; b=RcAz+GsH3KORIq57euKft+KF5XhEG6HBcd4035z4a/HBWt5ONn2SyZsB37xussQJID98TC s02QY/1qCbNfqH3oCKub6ayy4UPYIP0ccTEDbE2jSbsDON8I+MC7DL64mgbGRIJz1xnIai afG31xBNAAnQ7JkkoE7GP9zEO9LhIYw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-140-yJa51WXXPGmMSsKPFuI_8w-1; Wed, 24 Apr 2024 12:16:55 -0400 X-MC-Unique: yJa51WXXPGmMSsKPFuI_8w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6E0C28E73A4; Wed, 24 Apr 2024 16:16:54 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.45.224.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C5311C060D0; Wed, 24 Apr 2024 16:16:54 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 43OGGqcB1045814 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 24 Apr 2024 18:16:52 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 43OGGqEC1045813; Wed, 24 Apr 2024 18:16:52 +0200 Date: Wed, 24 Apr 2024 18:16:51 +0200 From: Jakub Jelinek To: Jonathan Wakely , Jason Merrill , Jan Hubicka Cc: gcc-patches@gcc.gnu.org, Richard Biener , Patrick Palka Subject: [PATCH] c++, v3: Retry the aliasing of base/complete cdtor optimization at import_export_decl time [PR113208] Message-ID: References: <5fe9db40-4bff-4be4-a434-6509133f26e3@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org On Wed, Apr 24, 2024 at 10:16:05AM +0100, Jonathan Wakely wrote: > > That fixes the testcases too, but seems to regress > > +FAIL: libstdc++-abi/abi_check > There are explicit instantiation definitions that should instantiate > those types: > > src/c++17/fs_dir.cc:template class std::__shared_ptr; > src/c++17/fs_dir.cc:template class > std::__shared_ptr; > src/c++17/fs_path.cc:template class std::__shared_ptr fs::filesystem_error::_Impl>; > > So the missing symbols should be present in cow-fs_dir.o and cow-fs_path.o So this boils down to (cvise reduced): namespace __gnu_cxx { enum _Lock_policy { _S_single, _S_mutex, _S_atomic } const __default_lock_policy = _S_atomic; } namespace std { using __gnu_cxx::__default_lock_policy; using __gnu_cxx::_Lock_policy; template struct __shared_ptr { constexpr __shared_ptr() {} }; namespace filesystem { struct _Dir; struct directory_iterator { __shared_ptr<_Dir> _M_dir; }; void end() { directory_iterator(); } } extern template class __shared_ptr; } namespace fs = std::filesystem; template class std::__shared_ptr; at -O2, previously it used to emit _ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE2EEC2Ev _ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE1EEC2Ev but now no longer does with the yesterday posted PR113208 patch. The following updated patch fixes that by calling note_vague_linkage_fn for the cdtor clones from maybe_clone_body if the flags suggest that the maybe-in-charge cdtor had tentative_decl_linkage -> note_vague_linkage_fn called too. And then I've noticed that in some cases the updated comdat group set by maybe_clone_body (*C5* or *D5*) was then overwritten again by maybe_make_one_only. So the patch tweaks cxx_comdat_group, so that when some comdat group has been chosen already it doesn't try to use some different one. Bootstrapped/regtested on x86_64-linux and i686-linux, this one doesn't regress anything unlike the earlier patch. 2024-04-24 Jakub Jelinek PR lto/113208 * decl2.cc (tentative_decl_linkage): Use comdat_linkage also for implicit instantiations of maybe in charge ctors/dtors if -fimplicit-templates or -fimplicit-inline-templates and -fweak and target supports aliases. * optimize.cc (maybe_clone_body): Call note_vague_linkage_fn on clone if fn has DECL_INTERFACE_KNOWN, DECL_NOT_REALLY_EXTERN and DECL_DEFER_OUTPUT flags set. * decl.cc (cxx_comdat_group): For DECL_CLONED_FUNCTION_P functions if SUPPORTS_ONE_ONLY return DECL_COMDAT_GROUP if already set. * g++.dg/abi/comdat2.C: New test. * g++.dg/abi/comdat3.C: New test. * g++.dg/lto/pr113208_0.C: New test. * g++.dg/lto/pr113208_1.C: New file. * g++.dg/lto/pr113208.h: New file. Jakub --- gcc/cp/decl2.cc.jj 2024-04-23 14:49:41.933186265 +0200 +++ gcc/cp/decl2.cc 2024-04-24 15:17:09.043625729 +0200 @@ -3314,7 +3314,16 @@ tentative_decl_linkage (tree decl) to mark the functions at this point. */ if (DECL_DECLARED_INLINE_P (decl) && (!DECL_IMPLICIT_INSTANTIATION (decl) - || DECL_DEFAULTED_FN (decl))) + || DECL_DEFAULTED_FN (decl) + /* For implicit instantiations of cdtors, + if import_export_decl would use comdat linkage, + make sure to use it right away, so that maybe_clone_body + can use aliases. See PR113208. */ + || (DECL_MAYBE_IN_CHARGE_CDTOR_P (decl) + && (flag_implicit_templates + || flag_implicit_inline_templates) + && flag_weak + && TARGET_SUPPORTS_ALIASES))) { /* This function must have external linkage, as otherwise DECL_INTERFACE_KNOWN would have been --- gcc/cp/optimize.cc.jj 2024-04-24 13:44:26.456634100 +0200 +++ gcc/cp/optimize.cc 2024-04-24 14:46:13.050371557 +0200 @@ -717,6 +717,10 @@ maybe_clone_body (tree fn) else expand_or_defer_fn (clone); first = false; + if (DECL_INTERFACE_KNOWN (fn) + && DECL_NOT_REALLY_EXTERN (fn) + && DECL_DEFER_OUTPUT (fn)) + note_vague_linkage_fn (clone); } pop_from_top_level (); --- gcc/cp/decl.cc.jj 2024-04-23 08:31:05.515161033 +0200 +++ gcc/cp/decl.cc 2024-04-24 15:15:34.401951491 +0200 @@ -19254,6 +19254,14 @@ cxx_comdat_group (tree decl) else break; } + /* If a ctor/dtor has already set the comdat group by + maybe_clone_body, don't override it. */ + if (SUPPORTS_ONE_ONLY + && TREE_CODE (decl) == FUNCTION_DECL + && DECL_CLONED_FUNCTION_P (decl) + && SUPPORTS_ONE_ONLY) + if (tree comdat = DECL_COMDAT_GROUP (decl)) + return comdat; } return decl; --- gcc/testsuite/g++.dg/abi/comdat2.C.jj 2024-04-24 13:44:11.054849035 +0200 +++ gcc/testsuite/g++.dg/abi/comdat2.C 2024-04-24 13:44:11.054849035 +0200 @@ -0,0 +1,26 @@ +// PR lto/113208 +// { dg-do compile { target { c++11 && { *-*-*gnu* } } } } +// { dg-additional-options "-O2 -fkeep-inline-functions" } +// { dg-final { scan-assembler "_ZN1BI1CEC5ERKS1_,comdat" } } +// { dg-final { scan-assembler-not "_ZN1BI1CEC1ERKS1_,comdat" } } +// { dg-final { scan-assembler-not "_ZN1BI1CEC2ERKS1_,comdat" } } + +template +struct A { + int foo () const; + A (int, int); +}; +template +struct B : A { + constexpr B (const B &x) : A (1, x.foo ()) {} + B () : A (1, 2) {} +}; +struct C; +struct D : B {}; +void bar (D); + +void +baz (D x) +{ + bar (x); +} --- gcc/testsuite/g++.dg/abi/comdat3.C.jj 2024-04-24 15:23:58.829885362 +0200 +++ gcc/testsuite/g++.dg/abi/comdat3.C 2024-04-24 15:24:46.088223353 +0200 @@ -0,0 +1,22 @@ +// PR lto/113208 +// { dg-do compile { target { c++11 && { *-*-*gnu* } } } } +// { dg-additional-options "-O2" } +// { dg-final { scan-assembler "_ZN1M1SINS_1P1TELN1N1LE2EEC5Ev,comdat" } } +// { dg-final { scan-assembler-not "_ZN1M1SINS_1P1TELN1N1LE2EEC1Ev,comdat" } } +// { dg-final { scan-assembler-not "_ZN1M1SINS_1P1TELN1N1LE2EEC2Ev,comdat" } } + +namespace N { enum L { L1, L2, L3 } const O = L3; } +namespace M { + using N::O; + using N::L; + template + struct S { constexpr S () {} }; + namespace P { + struct T; + struct U { S u; }; + void foo () { U (); } + } + extern template class S; +} +namespace p = M::P; +template class M::S; --- gcc/testsuite/g++.dg/lto/pr113208_0.C.jj 2024-04-24 13:43:17.887591040 +0200 +++ gcc/testsuite/g++.dg/lto/pr113208_0.C 2024-04-24 13:44:11.055849021 +0200 @@ -0,0 +1,13 @@ +// { dg-lto-do link } +// { dg-lto-options { {-O1 -std=c++20 -flto}} } +// { dg-extra-ld-options "-r -nostdlib -flinker-output=nolto-rel" } +// { dg-require-linker-plugin "" } + +#define CONSTEXPR constexpr +#include "pr113208.h" + +struct QualityValue; +struct k : vector {}; + +void m(k); +void n(k i) { m(i); } --- gcc/testsuite/g++.dg/lto/pr113208_1.C.jj 2024-04-24 13:43:17.887591040 +0200 +++ gcc/testsuite/g++.dg/lto/pr113208_1.C 2024-04-24 13:44:11.055849021 +0200 @@ -0,0 +1,6 @@ +#define CONSTEXPR +#include "pr113208.h" + +struct QualityValue; +vector values1; +vector values{values1}; --- gcc/testsuite/g++.dg/lto/pr113208.h.jj 2024-04-24 13:43:17.887591040 +0200 +++ gcc/testsuite/g++.dg/lto/pr113208.h 2024-04-24 13:44:11.054849035 +0200 @@ -0,0 +1,10 @@ +template struct _Vector_base { + int g() const; + _Vector_base(int, int); +}; +template +struct vector : _Vector_base<_Tp> { + CONSTEXPR vector(const vector &__x) + : _Vector_base<_Tp>(1, __x.g()) {} + vector() : _Vector_base<_Tp>(1, 2) {} +};