From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 520513858D39; Fri, 21 Oct 2022 07:03:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 520513858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666335814; bh=TzPak0LjIMIgc9zgNd3DMIXCRPuAd8u0ebpF7NgC6hM=; h=From:To:Subject:Date:From; b=oyXKYfZR7U6fnHn36e7i+wdYHkcLvwLfgdRISOcxRJKLsnkZJmYSHunjiohfgt7sa r4gubTiFtOPKZeFBDe0alwDIq1f1pzUQSFUFCGoiIdC7SaKN9ZcWMCBDagTmbbs+30 7XcrDkqCUOyYd/ftG7fqT1kX55xRfZOf8zHBPt1o= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3429] c++: Fix up mangling ICE with void{} [PR106863] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 36ba985145ffa8e2078033fc1f1cf22851707a8e X-Git-Newrev: 5f9fac6ca86458ef21ab91ca471429d63f954003 Message-Id: <20221021070334.520513858D39@sourceware.org> Date: Fri, 21 Oct 2022 07:03:34 +0000 (GMT) List-Id: https://gcc.gnu.org/g:5f9fac6ca86458ef21ab91ca471429d63f954003 commit r13-3429-g5f9fac6ca86458ef21ab91ca471429d63f954003 Author: Jakub Jelinek Date: Fri Oct 21 09:00:41 2022 +0200 c++: Fix up mangling ICE with void{} [PR106863] We ICE on the following testcase during mangling, finish_compound_literal returns for void{} void_node and the mangler doesn't handle it. Handling void_node in the mangler seems problematic to me, because we don't know for which case it has been created. The following patch arranges to mangle it as other compound literals with no operands, so it demangles as void{}, by returning a void type COMPOUND_LITERAL_P with no elements if processing_template_decl. Otherwise it keeps returning void_node. 2022-10-21 Jakub Jelinek PR c++/106863 * semantics.cc (finish_compound_literal): For void{}, if processing_template_decl return a COMPOUND_LITERAL_P CONSTRUCTOR rather than void_node. * g++.dg/cpp0x/dr2351-2.C: New test. Diff: --- gcc/cp/semantics.cc | 9 ++++++++- gcc/testsuite/g++.dg/cpp0x/dr2351-2.C | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 7d46c3c2db9..82f9dd8dd4e 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -3164,7 +3164,14 @@ finish_compound_literal (tree type, tree compound_literal, { /* DR2351 */ if (VOID_TYPE_P (type) && CONSTRUCTOR_NELTS (compound_literal) == 0) - return void_node; + { + if (!processing_template_decl) + return void_node; + TREE_TYPE (compound_literal) = type; + TREE_HAS_CONSTRUCTOR (compound_literal) = 1; + CONSTRUCTOR_IS_DEPENDENT (compound_literal) = 0; + return compound_literal; + } else if (VOID_TYPE_P (type) && processing_template_decl && maybe_zero_constructor_nelts (compound_literal)) diff --git a/gcc/testsuite/g++.dg/cpp0x/dr2351-2.C b/gcc/testsuite/g++.dg/cpp0x/dr2351-2.C new file mode 100644 index 00000000000..deb1718072e --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/dr2351-2.C @@ -0,0 +1,16 @@ +// DR2351 +// { dg-do compile { target c++11 } } + +void bar (int); + +template +auto foo (T t) -> decltype (bar (t), void{}) +{ + return bar (t); +} + +int +main () +{ + foo (0); +}