From patchwork Fri Dec 22 00:20:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1879486 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=FzxLMjDB; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4Sx7HK1JQ7z1ySd for ; Fri, 22 Dec 2023 11:20:29 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1762638618B5 for ; Fri, 22 Dec 2023 00:20:27 +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 037B93858408 for ; Fri, 22 Dec 2023 00:20:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 037B93858408 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 037B93858408 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=1703204413; cv=none; b=Li1XVOVwkCLS4rZ3QqKU3PboOSj2iZXpuQt5TfxcwUgUTmwgI50Ix5Cot5qZPZIga6jpk+j0QEFjpzti2Kt5ttJQjI3yRLZJiy30JXVtJYEPDQT6LKexktgcJuc0ut5Wk8h2wRUhdeQ2xahjdxjUodJuhetkN7XIpzTTw+/OGMY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703204413; c=relaxed/simple; bh=S08JfYf15VsiJVRKPAC3o5d0D93VhMhVfA1dg0hk2Bk=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=lVYFs+JGbyb07wgeS/SXzNmDiBNBst5nMB83EKmgPHRaWE/XDpctFZHo/IumSFq2UED+oGRi9OgHc6NnnIpJQNEqjqA9WTIigKhPCszFFQefryy8AbIejDuUMCyxuBC4ivaBaDh58OsKllRH5KzQwooHEll6Hj6GC+kk51uhAJ8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703204408; 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=h9nh+tkN6Riycu/ERlrb7EW88UerUS7b0eIyXFloIRo=; b=FzxLMjDBrrE/ZsOATeombRfcmHuf/PczAGTqdUF3aTFoNK2Mx61804kMnXO6X5hoZtxmas hyr8JcvQgcq/KRYZWOEC5Yd1hOZHBYPHfRinVohQ5LjACq/ucveitaZypm9ft1iv1EKz1I 09k7iohGN5Kp+0YcNiE1JL7fkQQv/+0= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-220-AcCGXV2GP32tPCMIlmj5uA-1; Thu, 21 Dec 2023 19:20:05 -0500 X-MC-Unique: AcCGXV2GP32tPCMIlmj5uA-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-67f772d30a9so18091766d6.0 for ; Thu, 21 Dec 2023 16:20:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703204405; x=1703809205; 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=h9nh+tkN6Riycu/ERlrb7EW88UerUS7b0eIyXFloIRo=; b=bRdXbhW39iBdKSbrRjY67+uimG6sxAxVhtHeRFJJGksxHhOA5aXcp4WkpcS+iwi7Vu ehNfd18cTVkvkfZU7wUvLyMboQWQiQSxYvf27RWdRVKmr6j6hT6RTIYh8FRM4IkCu7GR UghmSvIizjVoyOEiisOqR3TJJvMpSanoZ9BgJcUNyCOh1ODbA24osleNEIBcnNg3Mesi LvdUEtZibQ+ptbrStSqNrIhigix+7RoTJRFKo+FQGt9uEca0OCyU/OJFuLqK3TwqNeP+ Gm6dePTPr4sJs7Ge9UoXceuTj7SN320kwfgZyqlL1SHg2RZ0Xxhl1/C6m6SUC4cQf3Aw 44ww== X-Gm-Message-State: AOJu0YymVO1qQwIZbPsOurMzAH9cWIilCJG8inUf0I0gK13fOLB7mtWA rTpYE/VDHfOpf0F3zJb3HzVrxyBZRiOHLiJGk9KoQkRwzHMxg1UMKn1ADMeK2rfZ1XEdV7RNpDz DWooo5lJ71szdAKW9oz0fEzq4oXykkD7efy+FUZ3XICx7r8Cg6vepkAF06MFPXjaPw8SOz+VC7z Fdq1PTFg== X-Received: by 2002:a05:6214:d01:b0:67a:a721:e135 with SMTP id 1-20020a0562140d0100b0067aa721e135mr587403qvh.98.1703204404756; Thu, 21 Dec 2023 16:20:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFAqEXTJH7FAKG3WkP/x4y95UG4Ts8d0TaaCZZoOTbRYF7aKOlmYH+scFx8tCSAkocTBojeUQ== X-Received: by 2002:a05:6214:d01:b0:67a:a721:e135 with SMTP id 1-20020a0562140d0100b0067aa721e135mr587391qvh.98.1703204404314; Thu, 21 Dec 2023 16:20:04 -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 u6-20020a05621411a600b0067f3a71ad96sm983969qvv.72.2023.12.21.16.20.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 16:20:03 -0800 (PST) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: sizeof... mangling with alias template [PR95298] Date: Thu, 21 Dec 2023 19:20:02 -0500 Message-Id: <20231222002002.3536507-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< -- We were getting sizeof... mangling wrong when the argument after substitution was a pack expansion that is not a simple T..., such as list... in variadic-mangle4.C or (A+1)... in variadic-mangle5.C. In the former case we ICEd; in the latter case we wrongly mangled it as sZ . PR c++/95298 gcc/cp/ChangeLog: * mangle.cc (write_expression): Handle v18 sizeof... bug. * pt.cc (tsubst_pack_expansion): Keep TREE_VEC for sizeof... (tsubst_expr): Don't strip TREE_VEC here. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/variadic-mangle2.C: Add non-member. * g++.dg/cpp0x/variadic-mangle4.C: New test. * g++.dg/cpp0x/variadic-mangle5.C: New test. * g++.dg/cpp0x/variadic-mangle5a.C: New test. --- gcc/cp/mangle.cc | 14 +++++++++ gcc/cp/pt.cc | 12 ++++++-- gcc/testsuite/g++.dg/cpp0x/variadic-mangle2.C | 8 +++++ gcc/testsuite/g++.dg/cpp0x/variadic-mangle4.C | 29 +++++++++++++++++++ gcc/testsuite/g++.dg/cpp0x/variadic-mangle5.C | 13 +++++++++ .../g++.dg/cpp0x/variadic-mangle5a.C | 13 +++++++++ 6 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic-mangle4.C create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic-mangle5.C create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic-mangle5a.C base-commit: cdfaa4aa52752e55d27bb068b6de933d17b176d3 prerequisite-patch-id: 6b409ce898fde643a415f24e698c3cca69ff34d6 diff --git a/gcc/cp/mangle.cc b/gcc/cp/mangle.cc index 365d470f46e..36c5ac5c4da 100644 --- a/gcc/cp/mangle.cc +++ b/gcc/cp/mangle.cc @@ -3444,6 +3444,7 @@ write_expression (tree expr) if (PACK_EXPANSION_P (op)) { + sizeof_pack: if (abi_check (11)) { /* sZ rather than szDp. */ @@ -3464,6 +3465,19 @@ write_expression (tree expr) int length = TREE_VEC_LENGTH (args); if (abi_check (10)) { + /* Before v19 we wrongly mangled all single pack expansions with + sZ, but now only for expressions, as types ICEd (95298). */ + if (length == 1) + { + tree arg = TREE_VEC_ELT (args, 0); + if (TREE_CODE (arg) == EXPR_PACK_EXPANSION + && !abi_check (19)) + { + op = arg; + goto sizeof_pack; + } + } + /* sP * E # sizeof...(T), size of a captured template parameter pack from an alias template */ write_string ("sP"); diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 2817657a8bb..5278ef6e981 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -13572,7 +13572,15 @@ tsubst_pack_expansion (tree t, tree args, tsubst_flags_t complain, /* If the argument pack is a single pack expansion, pull it out. */ if (TREE_VEC_LENGTH (args) == 1 && pack_expansion_args_count (args)) - return TREE_VEC_ELT (args, 0); + { + tree arg = TREE_VEC_ELT (args, 0); + if (PACK_EXPANSION_SIZEOF_P (t) + && !TEMPLATE_PARM_P (PACK_EXPANSION_PATTERN (arg))) + /* Except if this isn't a simple sizeof...(T) which gets sZ + mangling, keep the TREE_VEC to get sP mangling. */; + else + return TREE_VEC_ELT (args, 0); + } /* Types need no adjustment, nor does sizeof..., and if we still have some pack expansion args we won't do anything yet. */ @@ -20261,8 +20269,6 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl) { if (PACK_EXPANSION_P (expanded)) /* OK. */; - else if (TREE_VEC_LENGTH (expanded) == 1) - expanded = TREE_VEC_ELT (expanded, 0); else expanded = make_argument_pack (expanded); diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-mangle2.C b/gcc/testsuite/g++.dg/cpp0x/variadic-mangle2.C index ea96ef87308..596242ab8b7 100644 --- a/gcc/testsuite/g++.dg/cpp0x/variadic-mangle2.C +++ b/gcc/testsuite/g++.dg/cpp0x/variadic-mangle2.C @@ -8,6 +8,11 @@ struct A { template using M = int[sizeof...(T)]; template void g(M &); }; + +template using N = int[sizeof...(T)]; +template void f(N &); +// equivalent to template void f(int(&)[sizeof...(T)]) + void g(A a) { int arr[3]; @@ -15,4 +20,7 @@ void g(A a) a.f<1,2,3>(arr); // { dg-final { scan-assembler "_ZN1A1gIJiiiEEEvRAsZT__i" } } a.g(arr); + // { dg-final { scan-assembler "_Z1fIJiiiEEvRAsZT__i" } } + f(arr); } + diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-mangle4.C b/gcc/testsuite/g++.dg/cpp0x/variadic-mangle4.C new file mode 100644 index 00000000000..6930180d777 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic-mangle4.C @@ -0,0 +1,29 @@ +// PR c++/95298 +// { dg-do compile { target c++11 } } +// { dg-additional-options -fabi-compat-version=0 } + +template +struct list{}; + +template +struct _func_select +{ + using f = void; +}; + +struct func +{ + template + using f = typename _func_select::f; +}; + +template +func::f...> foo(T&&...) +{} + +// { dg-final { scan-assembler "_Z3fooIJEEN12_func_selectIXsPDp4listIJT_EEEEE1fEDpOS2_" } } + +int main() +{ + foo(); +} diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-mangle5.C b/gcc/testsuite/g++.dg/cpp0x/variadic-mangle5.C new file mode 100644 index 00000000000..e22a33dad61 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic-mangle5.C @@ -0,0 +1,13 @@ +// { dg-do compile { target c++11 } } +// { dg-additional-options "-fabi-version=0 -fabi-compat-version=0" } + +template using N = int[sizeof...(T)]; +template void f(N<(A+1)...> &); + +void g() +{ + int arr[3]; + + // { dg-final { scan-assembler "_Z1fIJLi1ELi2ELi3EEEvRAsPXspplT_Li1EEE_i" } } + f<1,2,3>(arr); +} diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-mangle5a.C b/gcc/testsuite/g++.dg/cpp0x/variadic-mangle5a.C new file mode 100644 index 00000000000..eb1b0847a99 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic-mangle5a.C @@ -0,0 +1,13 @@ +// { dg-do compile { target c++11 } } +// { dg-additional-options "-fabi-version=18 -fabi-compat-version=18" } + +template using N = int[sizeof...(T)]; +template void f(N<(A+1)...> &); + +void g() +{ + int arr[3]; + + // { dg-final { scan-assembler "_Z1fIJLi1ELi2ELi3EEEvRAsZplT_Li1E_i" } } + f<1,2,3>(arr); +}