From patchwork Thu Mar 16 22:09:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 66485 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 361793851ABD for ; Thu, 16 Mar 2023 22:11:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 361793851ABD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679004663; bh=t2V3QrugGjMcPLUbdeCX4wz5onJBOG8osVY48jtWnQM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=jOZu+UBv+qEsqyGGz5Pkjp0MXvVs+mCeTq6xfEKBEMwCW7Ha7+a/9BXH760h8TMgl 0G4bbW25uzcYma94RAdCIgGjS8uS6Qdezi/vBWvYk6GJKnZ5OZzdtV6s85KXZbJOj/ pYawnDcSSDDdaupwnPbdmDftlnjOxQa4vAaJ8J8Y= 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 A73BA3858D35 for ; Thu, 16 Mar 2023 22:10:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A73BA3858D35 Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-120-qdxd0W-CM1WH1yWy75UOJA-1; Thu, 16 Mar 2023 18:10:10 -0400 X-MC-Unique: qdxd0W-CM1WH1yWy75UOJA-1 Received: by mail-qt1-f200.google.com with SMTP id i24-20020ac84f58000000b003bfe3358691so1595998qtw.21 for ; Thu, 16 Mar 2023 15:10:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679004609; 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=t2V3QrugGjMcPLUbdeCX4wz5onJBOG8osVY48jtWnQM=; b=3xiodz/V4ZL0HvH9l+ONk89n0uTO5SZZwCN2MGBeQ1pHWtBEZvHkwEWiUSvqFHMZSi s4r4N0du6BVDX9ChjPZimOtzrpCD3cJmmpIZLn0sPIN3UkQ5rNPVFNwVp09nRUnPBtsc tz6X0mQ/3KnRzH+HbVdPNtAtxA3y8Tc380h1HrIBY5MNyH6aNFVU7hObF1r+Qxi4AEAQ Gr378AWfSCe1ItLCZmRBMz2GE0MTcRkbMGI9mkYWy6s5A/SSefmBuZ3ZjqXOg7fj11T6 bUsJqwGibEI6Kh/zK3H+I+6QPSLiVF1x6JVFApyt1RknS4rLc447jZual60ebazYPEhU tBAg== X-Gm-Message-State: AO0yUKUg4G4RH4TwMzvKkPc7wPM6MIi8XeuvASmfkp7G8z+wG7yCsF8p jozEq0Q6CbJGB++NIroAlUhd5dMdgvpQG2cRZJsDYokGuOAU6osHrXN2O3hxb0cfMW5H9fSr5E4 Wv3SbVpow6uu1C//3QxWotnQzUvACXz6GgBMhuXQBgNM+4/I5mJjCfiiYRyuy/V6/onxyAEoCIg == X-Received: by 2002:ad4:5bc7:0:b0:56e:bb43:a087 with SMTP id t7-20020ad45bc7000000b0056ebb43a087mr33659098qvt.16.1679004609406; Thu, 16 Mar 2023 15:10:09 -0700 (PDT) X-Google-Smtp-Source: AK7set//74iUZaD/wLefbh23l4KYiHaKkY/pN6XNCoKZK4w9EEkmpI00yBcicZBKtWDJNPkECRAkUw== X-Received: by 2002:ad4:5bc7:0:b0:56e:bb43:a087 with SMTP id t7-20020ad45bc7000000b0056ebb43a087mr33659061qvt.16.1679004608981; Thu, 16 Mar 2023 15:10:08 -0700 (PDT) Received: from jason.cygnus.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id p138-20020a374290000000b007426b917031sm352685qka.121.2023.03.16.15.10.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 15:10:08 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: &enum::enumerator [PR101869] Date: Thu, 16 Mar 2023 18:09:48 -0400 Message-Id: <20230316220948.1138021-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 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: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- We don't want to call build_offset_ref with an enum. PR c++/101869 gcc/cp/ChangeLog: * semantics.cc (finish_qualified_id_expr): Don't try to build a pointer-to-member if the scope is an enumeration. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/enum43.C: New test. --- gcc/cp/semantics.cc | 3 ++- gcc/testsuite/g++.dg/cpp0x/enum43.C | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/enum43.C base-commit: e6ccae0ac0d53cfa9099d62fada050ee87d4d0ad diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 57dd7b66da8..87c2e8a7111 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -2386,7 +2386,8 @@ finish_qualified_id_expr (tree qualifying_class, /* If EXPR occurs as the operand of '&', use special handling that permits a pointer-to-member. */ - if (address_p && done) + if (address_p && done + && TREE_CODE (qualifying_class) != ENUMERAL_TYPE) { if (TREE_CODE (expr) == SCOPE_REF) expr = TREE_OPERAND (expr, 1); diff --git a/gcc/testsuite/g++.dg/cpp0x/enum43.C b/gcc/testsuite/g++.dg/cpp0x/enum43.C new file mode 100644 index 00000000000..b2cd9797a06 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/enum43.C @@ -0,0 +1,11 @@ +// PR c++/101869 + +enum E { A }; +E operator & (E e) +{ + return e; +} +E f(void) +{ + return &E::A; // { dg-error "not a class" "" { target c++98_only } } +}