From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 295083857C66 for ; Tue, 13 Feb 2024 23:12:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 295083857C66 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 295083857C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707865977; cv=none; b=Dc9jouZRn8CDgn66jkhjWLvITdgH9gxnNcPyX8E6sDPVyPfE1QTsB27L+YQ2PW1rZaHrA5jXV+1h+JNZSaClxqtK+1J1Z1hLvNXG47UEZ3pilq3YG9tgnXujnkCUcsWwXIyChYl0Gq4s4FS1GKAFUClplUf3umLN/yy2ewlqtKA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707865977; c=relaxed/simple; bh=75Vi/NVrchGHjdgsX8ORjswdgO7aQ9IVv+7E7l6ZEjU=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=hETqcIkJ2vdLG0veQYUNNo2WNM1IkjaswV3Rm2i7upCvvOQYhdX7VeJUXFGsrznZXi4L+YnN689LMutSiW0mwuKE1IDUBBlc1mM+dn4+th8GxFAA8Ecb0dyBUKloP5f3RZCE7A5GT2p98cmOGqeCRLZfL6snP/i+NLILXtPwuLo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707865974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ezvRVUFCr9Rzgh7q6pNaiht/DK4eab/APZ+Xs4pVRyw=; b=Ymrk/vrwGDYVS8y9TVM/PjfyijRApGV6Noau3autBVpw1Y9iRRpypNFs+t3Uhg38LJ6t1n RW7qKetfubWTh+VGoQlRJXr1tb7L30dVeJfDXpdyYKVv4EvRBFFxR/q3auDLOQZ/uu1fTg tbaMN9DiUU4EZtfNCNCwinsX3OAIOGk= 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-311-u90msjePOYSA3yWiJwj3JQ-1; Tue, 13 Feb 2024 18:12:53 -0500 X-MC-Unique: u90msjePOYSA3yWiJwj3JQ-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-67ef8bbfe89so87344706d6.0 for ; Tue, 13 Feb 2024 15:12:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707865973; x=1708470773; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ezvRVUFCr9Rzgh7q6pNaiht/DK4eab/APZ+Xs4pVRyw=; b=jLT96MVe/XF9EuT4fXd9AWh0uMznByGI/SuxiiEDLaYaOouPQyOsJcIyXyjmya6H2N R5AXOTk/2hSxuIftN2NatPFFdQZi0MLLYBywBOeT5CPp8T+DEXjBEZv8yRfL1EYYULjU iRR+YgyOzS9MnQfw1GQ2R2UDW0BUrV7dRjEC505OgSXCYNhEKsFBbrgTlJn+K5UtGN8K 3OxUl91DyNpy1Hpo+IBdeLRZrkK3dtCIsEZMC+/Wbl0MIOJt7OuH0WLxsNwaftShyMRy ZjIWh48IoOA5X6vd4+9/2NvIv4A6+YB1JWU4CZKk2zmmIvrHF2q4L6eePCZPehBc1IMV Ml+A== X-Forwarded-Encrypted: i=1; AJvYcCWSbkoBca1bY1/HiICRaVeG2IBkY0/L7U7Kxkna6oV6IHafZ+jtKMh5vv4q17ONRH2YUP2ZPX16irap0QPZeVzDfmuml7YSCQ== X-Gm-Message-State: AOJu0YyoZQUgntX8AqycTgB2C8Bth/MPjsjsZRzS5bmtIZdMx9x3vwj8 xWPyccz6cHEBav6XXfKpTPbPxwQJuv3OeBUdCqHvxZAFn+QBoRa7gSsZpv9UylykGtgO7maR5Cn 0fgRymBJwO06Opb+QsQjtlp2SvGIJxH+o9DhmZ0NHZjOav3LWuOdPruc= X-Received: by 2002:a0c:f347:0:b0:68e:f3f5:209 with SMTP id e7-20020a0cf347000000b0068ef3f50209mr1035598qvm.14.1707865973157; Tue, 13 Feb 2024 15:12:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7fR75fvzfDKWUjVYgHwCUj8PTgyRyxRpmGFr2X0LTHrmepUbU1M+lliZ5vJOOOcIQQbgLeg== X-Received: by 2002:a0c:f347:0:b0:68e:f3f5:209 with SMTP id e7-20020a0cf347000000b0068ef3f50209mr1035585qvm.14.1707865972860; Tue, 13 Feb 2024 15:12:52 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXiT3CkTy1SNrhvtE9thNsu4YN6gcpPDJKCh59ddeIgfgIzRcGtvsWOnbj3mOhlK1SQyTmaOvLTKTQqe6MknJWLPGu1qpm5HQ== Received: from [192.168.1.130] (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 nc5-20020a0562142dc500b0068cc6524736sm1689774qvb.24.2024.02.13.15.12.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 13 Feb 2024 15:12:52 -0800 (PST) Message-ID: <3b56cd97-0a20-4b72-8352-6625c5cec9cb@redhat.com> Date: Tue, 13 Feb 2024 18:12:51 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] c++: Fix error recovery when redeclaring enum in different module [PR99573] To: Nathaniel Shead , gcc-patches@gcc.gnu.org Cc: Nathan Sidwell References: <65c981eb.050a0220.8c171.ba05@mx.google.com> From: Jason Merrill In-Reply-To: <65c981eb.050a0220.8c171.ba05@mx.google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.5 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_H2,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 List-Id: On 2/11/24 21:26, Nathaniel Shead wrote: > Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk? > > -- >8 -- > > This ensures that with modules enabled, redeclaring an enum in the wrong > module or with the wrong underlying type no longer ICEs. > > The patch also rearranges the order of the checks a little because I > think it's probably more important to note that you can't redeclare the > enum all before complaining about mismatched underlying types etc. > > As a drive by this patch also adds some missing diagnostic groups, and > rewords the module redeclaration error message to more closely match the > wording used in other places this check is done. > > PR c++/99573 > > gcc/cp/ChangeLog: > > * decl.cc (start_enum): Reorder check for redeclaring in module. > Add missing auto_diagnostic_groups. > > gcc/testsuite/ChangeLog: > > * g++.dg/modules/enum-12.C: New test. > > Signed-off-by: Nathaniel Shead > --- > gcc/cp/decl.cc | 31 +++++++++++++++----------- > gcc/testsuite/g++.dg/modules/enum-12.C | 10 +++++++++ > 2 files changed, 28 insertions(+), 13 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/modules/enum-12.C > > diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc > index 3e41fd4fa31..f982b5f88de 100644 > --- a/gcc/cp/decl.cc > +++ b/gcc/cp/decl.cc > @@ -16951,12 +16951,28 @@ start_enum (tree name, tree enumtype, tree underlying_type, > /*tag_scope=*/TAG_how::CURRENT_ONLY, > /*template_header_p=*/false); > > + /* Attempt to set the declaring module. */ > + if (modules_p () && enumtype && TREE_CODE (enumtype) == ENUMERAL_TYPE) > + { > + tree decl = TYPE_NAME (enumtype); > + if (!module_may_redeclare (decl)) > + { > + auto_diagnostic_group d; > + error ("cannot declare %qD in different module", decl); > + inform (DECL_SOURCE_LOCATION (decl), "previously declared here"); > + enumtype = error_mark_node; > + } > + else > + set_instantiating_module (decl); > + } > + > /* In case of a template_decl, the only check that should be deferred > to instantiation time is the comparison of underlying types. */ > if (enumtype && TREE_CODE (enumtype) == ENUMERAL_TYPE) > { How about moving the module checks here, instead of a few lines higher, where you need to duplicate the ENUMERAL_TYPE condition? > if (scoped_enum_p != SCOPED_ENUM_P (enumtype)) > { > + auto_diagnostic_group d; > error_at (input_location, "scoped/unscoped mismatch " > "in enum %q#T", enumtype); > inform (DECL_SOURCE_LOCATION (TYPE_MAIN_DECL (enumtype)), > @@ -16965,6 +16981,7 @@ start_enum (tree name, tree enumtype, tree underlying_type, > } > else if (ENUM_FIXED_UNDERLYING_TYPE_P (enumtype) != !! underlying_type) > { > + auto_diagnostic_group d; > error_at (input_location, "underlying type mismatch " > "in enum %q#T", enumtype); > inform (DECL_SOURCE_LOCATION (TYPE_MAIN_DECL (enumtype)), > @@ -16975,25 +16992,13 @@ start_enum (tree name, tree enumtype, tree underlying_type, > && !same_type_p (underlying_type, > ENUM_UNDERLYING_TYPE (enumtype))) > { > + auto_diagnostic_group d; > error_at (input_location, "different underlying type " > "in enum %q#T", enumtype); > inform (DECL_SOURCE_LOCATION (TYPE_MAIN_DECL (enumtype)), > "previous definition here"); > underlying_type = NULL_TREE; > } > - > - if (modules_p ()) > - { > - if (!module_may_redeclare (TYPE_NAME (enumtype))) > - { > - error ("cannot define %qD in different module", > - TYPE_NAME (enumtype)); > - inform (DECL_SOURCE_LOCATION (TYPE_NAME (enumtype)), > - "declared here"); > - enumtype = error_mark_node; > - } > - set_instantiating_module (TYPE_NAME (enumtype)); > - } > } > > if (!enumtype || TREE_CODE (enumtype) != ENUMERAL_TYPE > diff --git a/gcc/testsuite/g++.dg/modules/enum-12.C b/gcc/testsuite/g++.dg/modules/enum-12.C > new file mode 100644 > index 00000000000..57eeb85d92a > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/enum-12.C > @@ -0,0 +1,10 @@ > +// PR c++/99573 > +// { dg-additional-options "-fmodules-ts" } > +// { dg-module-cmi !foo } > + > +export module foo; > +namespace std { > + enum class align_val_t : decltype(sizeof(int)) {}; // { dg-error "different module" } > +} > + > +// { dg-prune-output "not writing module" }