From patchwork Tue Oct 18 18:10:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1691659 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=MW9LoplH; dkim-atps=neutral Received: from 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MsMPP1PTrz23kT for ; Wed, 19 Oct 2022 05:11:21 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B36CF3858C2D for ; Tue, 18 Oct 2022 18:11:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B36CF3858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666116678; bh=MJzX7jbNQIV8iBAeWA4V0WilScIyOUJ7sQj6bfzJ7qU=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=MW9LoplHQ8fPiQNQswFNnBJPV6Rtb1s+s2KsP6QJyCjSUQoEezdV2DRuAmnJu8nMD 4xQH8zxncCxif17VvE5RO8WMwF8ySmqPrNoW4XAVloTeKtNBXTYFDwvav+FRRa9R2C kpi/FW+wmLVdmCp9di2eKUjI7NV719zswmZw/xmk= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id B964B3858D32 for ; Tue, 18 Oct 2022 18:10:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B964B3858D32 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_128_GCM_SHA256) id us-mta-457-lH_S75neOsyDcjg8n9CoUw-1; Tue, 18 Oct 2022 14:10:57 -0400 X-MC-Unique: lH_S75neOsyDcjg8n9CoUw-1 Received: by mail-qv1-f70.google.com with SMTP id lz4-20020a0562145c4400b004b495b96748so8663774qvb.14 for ; Tue, 18 Oct 2022 11:10:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MJzX7jbNQIV8iBAeWA4V0WilScIyOUJ7sQj6bfzJ7qU=; b=RjgFjGqikVdvLQ9aplNlGC59FALrr0uFhN0k+l1PmyIuXFBbjhFs3oxPP7LLkdA9dq 5NXQMQS2JVXQ9QOVWfm7W9VlYGJCWErWm4m00PETqDgqqMkCLJrNMOJJTpwyBJxjdz7W 6WDQZ84IcLVySsuyHVcu2Nkn28EF6VvsFfEoUNezTfYs7EfRniG3/oYysYdfp6UwQwhD 9cvqeaZv76PDB6oa9hU5uFpjJak9OSn+auM1mVjuduTOfuKAAjY/xv4/5U5ufi9OrNuU h1KlCz98wZi/vCbecaHatWjY76pHZwD4cO/6woSOBllRD9lWgF48u+3dWRSZNQ7sQHFt 5Yaw== X-Gm-Message-State: ACrzQf0H1ovWQ8BcPXwP4m0X1hEFL2OjVrbxo2XRo1hA07/EGQjgrQWh TDsdqETIXo34nXHn1M+kxVxrxwEpZomvcsRzSBLYJ+hY3c/jP0vRgcd8wtS2l1QCol6wYzjVGbc eHtTdukQI0K5GkG8bluExhJ72sZEKCpuf8suUAzP7arddhFDSmugc+QH2u5y0nKySeJo= X-Received: by 2002:a05:6214:e85:b0:4b1:7e5a:3604 with SMTP id hf5-20020a0562140e8500b004b17e5a3604mr3178219qvb.114.1666116656185; Tue, 18 Oct 2022 11:10:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5x/B+5WBH81JcxSAl92cxuaMef6ZaHkh8g/VjotztbJU82mEQSRis8l+kcmNZ6c+Jhnj8kkg== X-Received: by 2002:a05:6214:e85:b0:4b1:7e5a:3604 with SMTP id hf5-20020a0562140e8500b004b17e5a3604mr3178185qvb.114.1666116655763; Tue, 18 Oct 2022 11:10:55 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id g3-20020a05620a40c300b006ee8874f5fasm2989530qko.53.2022.10.18.11.10.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 11:10:55 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH 2/2] c++ modules: always stream TYPE_MIN/MAX_VALUE for enums [PR106848] Date: Tue, 18 Oct 2022 14:10:50 -0400 Message-Id: <20221018181050.1629201-2-ppalka@redhat.com> X-Mailer: git-send-email 2.38.0.118.g4732897cf0 In-Reply-To: <20221018181050.1629201-1-ppalka@redhat.com> References: <20221018181050.1629201-1-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.1 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 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Cc: nathan@acm.org Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" We currently stream TYPE_MIN/MAX_VALUE of an enum only if the enum is defined rather than just declared. But that seems inconsistent with what start_enum does, which always sets TYPE_MIN/MAX_VALUE on the ENUMERAL_TYPE (via copy_type_enum) even for an opaque enum that lacks a definition. This patch makes us stream TYPE_MIN/MAX_VALUE as part of the ENUMERAL_TYPE rather than as part of the defining TYPE_DECL so that TYPE_MIN/MAX_VALUE gets set even for opaque enums. Incidentally, this turns out to fix the below testcase in which during stream in we end up having created a type variant for the enum before we read the enum's definition, and thus the variant inherited stale TYPE_MIN/MAX_VALUE, which leads to an ICE from verify_type (with -g). (The stale variant got created from set_underlying_type during earlier stream in of the redundant typedef for the enum.) By streaming these fields as part of the ENUMERAL_TYPE, we guarantee they won't be stale. Tested on x86_64-pc-linux-gnu, does this look OK for trunk? PR c++/106848 gcc/cp/ChangeLog: * module.cc (trees_out::core_vals): Stream TYPE_MAX_VALUE and TYPE_MIN_VALUE of ENUMERAL_TYPE. (trees_in::core_vals): Likewise. (trees_out::write_enum_def): Don't stream them here. (trees_in::read_enum_def): Likewise. gcc/testsuite/ChangeLog: * g++.dg/modules/enum-10_a.H: New test. * g++.dg/modules/enum-10_b.C: New test. --- gcc/cp/module.cc | 29 ++++++++++++------------ gcc/testsuite/g++.dg/modules/enum-10_a.H | 5 ++++ gcc/testsuite/g++.dg/modules/enum-10_b.C | 6 +++++ 3 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 gcc/testsuite/g++.dg/modules/enum-10_a.H create mode 100644 gcc/testsuite/g++.dg/modules/enum-10_b.C diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index cc704817718..bb406a5cf01 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -6016,9 +6016,14 @@ trees_out::core_vals (tree t) if (CODE_CONTAINS_STRUCT (code, TS_TYPE_NON_COMMON)) { + if (code == ENUMERAL_TYPE) + { + WT (t->type_non_common.maxval); + WT (t->type_non_common.minval); + } /* Records and unions hold FIELDS, VFIELD & BINFO on these things. */ - if (!RECORD_OR_UNION_CODE_P (code) && code != ENUMERAL_TYPE) + else if (!RECORD_OR_UNION_CODE_P (code)) { // FIXME: These are from tpl_parm_value's 'type' writing. // Perhaps it should just be doing them directly? @@ -6529,9 +6534,14 @@ trees_in::core_vals (tree t) if (CODE_CONTAINS_STRUCT (code, TS_TYPE_NON_COMMON)) { + if (code == ENUMERAL_TYPE) + { + RT (t->type_non_common.maxval); + RT (t->type_non_common.minval); + } /* Records and unions hold FIELDS, VFIELD & BINFO on these things. */ - if (!RECORD_OR_UNION_CODE_P (code) && code != ENUMERAL_TYPE) + else if (!RECORD_OR_UNION_CODE_P (code)) { /* This is not clobbering TYPE_CACHED_VALUES, because this is a type that doesn't have any. */ @@ -12217,8 +12227,6 @@ trees_out::write_enum_def (tree decl) tree type = TREE_TYPE (decl); tree_node (TYPE_VALUES (type)); - tree_node (TYPE_MIN_VALUE (type)); - tree_node (TYPE_MAX_VALUE (type)); } void @@ -12242,8 +12250,6 @@ trees_in::read_enum_def (tree defn, tree maybe_template) { tree type = TREE_TYPE (defn); tree values = tree_node (); - tree min = tree_node (); - tree max = tree_node (); if (get_overrun ()) return false; @@ -12254,8 +12260,6 @@ trees_in::read_enum_def (tree defn, tree maybe_template) if (installing) { TYPE_VALUES (type) = values; - TYPE_MIN_VALUE (type) = min; - TYPE_MAX_VALUE (type) = max; rest_of_type_compilation (type, DECL_NAMESPACE_SCOPE_P (defn)); } @@ -12269,22 +12273,17 @@ trees_in::read_enum_def (tree defn, tree maybe_template) tree new_decl = TREE_VALUE (values); if (DECL_NAME (known_decl) != DECL_NAME (new_decl)) - goto bad; + break; new_decl = maybe_duplicate (new_decl); if (!cp_tree_equal (DECL_INITIAL (known_decl), DECL_INITIAL (new_decl))) - goto bad; + break; } if (known || values) - goto bad; - - if (!cp_tree_equal (TYPE_MIN_VALUE (type), min) - || !cp_tree_equal (TYPE_MAX_VALUE (type), max)) { - bad:; error_at (DECL_SOURCE_LOCATION (maybe_dup), "definition of %qD does not match", maybe_dup); inform (DECL_SOURCE_LOCATION (defn), diff --git a/gcc/testsuite/g++.dg/modules/enum-10_a.H b/gcc/testsuite/g++.dg/modules/enum-10_a.H new file mode 100644 index 00000000000..fb7d10ad3b6 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/enum-10_a.H @@ -0,0 +1,5 @@ +// PR c++/106848 +// { dg-additional-options -fmodule-header } +// { dg-module-cmi {} } + +typedef enum memory_order { memory_order_seq_cst } memory_order; diff --git a/gcc/testsuite/g++.dg/modules/enum-10_b.C b/gcc/testsuite/g++.dg/modules/enum-10_b.C new file mode 100644 index 00000000000..76dc3152963 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/enum-10_b.C @@ -0,0 +1,6 @@ +// PR c++/106848 +// { dg-additional-options "-fmodules-ts -g" } + +import "enum-10_a.H"; + +memory_order x = memory_order_seq_cst;