From patchwork Tue Oct 18 18:10:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 59013 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1AE173857C7C for ; Tue, 18 Oct 2022 18:11:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1AE173857C7C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666116686; bh=/n/dwZptbctRUO501WpoaidqQEUtsW4dMz6BFTaPPBw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=phbRDSjOHnwfMQ/fsstqAAGCRm1k/RuZTpD9NlCZ8ZIhLJWwvMqZZ4vIaOE6SiN9e P6aYrAVMtJW4PtgtgIqRU4sRPcTxg/g14TDpQp3LbRE+jkTdWbUF8RSrUKf8sOUqee LqGUXrG4FLMa3l02s1yU5MGwQQTEwAuetQPiRvDw= 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 9CE173858D39 for ; Tue, 18 Oct 2022 18:10:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9CE173858D39 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-443-MWzheaATPNeYUznRckW4Gg-1; Tue, 18 Oct 2022 14:10:55 -0400 X-MC-Unique: MWzheaATPNeYUznRckW4Gg-1 Received: by mail-qk1-f200.google.com with SMTP id u9-20020a05620a454900b006eeafac8ea4so12894834qkp.19 for ; Tue, 18 Oct 2022 11:10:55 -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:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/n/dwZptbctRUO501WpoaidqQEUtsW4dMz6BFTaPPBw=; b=uKgYaVURaCleVJyJXm+a385hcV0Q6PwRX9O5gozW1Pm51JQSVPqdvRyVK8NP66PDhi coX8jqZdCeWtiK8Z5r8D0oct5sgIplP8ChFRNrwChQrMz5w5CkwXVg3fcUCnNJ8Kkn5a e8Dszpp+sOhB6mXyUFAvK145z3H0fnNmNDxLrmDXQVjDK26J5awH51DCdsyq+ZOh4zbF oTWRKt4x2hGLjds+xMfUhA0AZmhEMuFO/pv4aE/rmU+Bp2tE1qzCww37inSbOay0geFv eLV0HVOwCOC6g//kwJO41tycEDoakG13zCPCgDVX+9fF1u2f4PgGPvujJWCgrhp4rRrO TRpQ== X-Gm-Message-State: ACrzQf2y7oRgodxWBtiiJ+pYNBhT4vMvzefOgn24MTm0OtzzbU9iKXKV cQy4QY5RYv2kue+y/DEuLS3scHA89anFy0Ub+hyc91oN5hdFasVK0TituJ72uGNi6UEPumkrZPG n/w+z7jTQvxcz5/zw4wT2DWs6eKTZGqd249CsFqULONtv9AJKOoFjLR7JGokty7rJkc4= X-Received: by 2002:a05:620a:258a:b0:6cf:ca19:1ec2 with SMTP id x10-20020a05620a258a00b006cfca191ec2mr2818127qko.630.1666116654366; Tue, 18 Oct 2022 11:10:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5g6Si3MQEIau9MOVQsCi8gH8MxX0D4qLE0uzer72x3mQBj4cgIhzT09nFtDY4yQA0gqxvJrQ== X-Received: by 2002:a05:620a:258a:b0:6cf:ca19:1ec2 with SMTP id x10-20020a05620a258a00b006cfca191ec2mr2818104qko.630.1666116654068; Tue, 18 Oct 2022 11:10:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 11:10:53 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH 1/2] c++ modules: streaming enum with no enumerators [PR102600] Date: Tue, 18 Oct 2022 14:10:49 -0400 Message-Id: <20221018181050.1629201-1-ppalka@redhat.com> X-Mailer: git-send-email 2.38.0.118.g4732897cf0 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" For an enum declaration, has_definition returns true iff its TYPE_VALUES field is non-empty. But this will wrongly return false for an enum that's defined to have no enumerators as in the below testcase. This patch fixes has_definition for such enums by checking OPAQUE_ENUM_P instead, which should always give us the right answer here. Tested on x86_64-pc-linux-gnu, does this look OK for trunk? PR c++/102600 gcc/cp/ChangeLog: * module.cc (has_definition): For an enum declaration, check OPAQUE_ENUM_P instead of TYPE_VALUES. gcc/testsuite/ChangeLog: * g++.dg/modules/enum-9_a.H: New test. * g++.dg/modules/enum-9_b.C: New test. --- gcc/cp/module.cc | 3 ++- gcc/testsuite/g++.dg/modules/enum-9_a.H | 5 +++++ gcc/testsuite/g++.dg/modules/enum-9_b.C | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/modules/enum-9_a.H create mode 100644 gcc/testsuite/g++.dg/modules/enum-9_b.C diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 2c2f9a9a8cb..cc704817718 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -11443,7 +11443,8 @@ has_definition (tree decl) if (type == TYPE_MAIN_VARIANT (type) && decl == TYPE_NAME (type) && (TREE_CODE (type) == ENUMERAL_TYPE - ? TYPE_VALUES (type) : TYPE_FIELDS (type))) + ? !OPAQUE_ENUM_P (type) + : TYPE_FIELDS (type) != NULL_TREE)) return true; } break; diff --git a/gcc/testsuite/g++.dg/modules/enum-9_a.H b/gcc/testsuite/g++.dg/modules/enum-9_a.H new file mode 100644 index 00000000000..1aecabfd0bd --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/enum-9_a.H @@ -0,0 +1,5 @@ +// PR c++/102600 +// { dg-additional-options -fmodule-header } +// { dg-module-cmi {} } + +enum class byte : unsigned char { }; diff --git a/gcc/testsuite/g++.dg/modules/enum-9_b.C b/gcc/testsuite/g++.dg/modules/enum-9_b.C new file mode 100644 index 00000000000..aa1fdf21444 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/enum-9_b.C @@ -0,0 +1,8 @@ +// PR c++/102600 +// { dg-additional-options -fmodules-ts } + +import "enum-9_a.H"; + +void push(byte) {} +void write(char v) { push(static_cast(v)); } +int main() { write(char{}); }