From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 2F26238460B1; Wed, 24 Apr 2024 21:50:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2F26238460B1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1713995444; bh=Fz1e4yvl4P6OEeGYkbc7H1lPMJebOzX3WwAVJMvsEgg=; h=From:To:Subject:Date:From; b=sAud2AH36SvmNie85ZvYDGfBdGjCSB6A2e+R07/vROIaTSZLiAVia310VUAiOpyFx Madf7nvojyWxDujdNaxJ5ZFKfZLD0j0Oh8sjaWVZh6KcizJLMphOmXM49punEcBRtb Xa+cJ+WcUkuNHP6pAIpQv9FuOrDPkw/1S3qPNFUQ= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-10110] c++: constexpr union member access folding [PR114709] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 97a54c05b8e338e673e1f7fb72c0e23abb571c60 X-Git-Newrev: 0844170e9ef60a8b2f6fba6786672f30ce1c2749 Message-Id: <20240424215044.2F26238460B1@sourceware.org> Date: Wed, 24 Apr 2024 21:50:44 +0000 (GMT) List-Id: https://gcc.gnu.org/g:0844170e9ef60a8b2f6fba6786672f30ce1c2749 commit r14-10110-g0844170e9ef60a8b2f6fba6786672f30ce1c2749 Author: Patrick Palka Date: Wed Apr 24 17:49:56 2024 -0400 c++: constexpr union member access folding [PR114709] The object/offset canonicalization performed in cxx_fold_indirect_ref is undesirable for union member accesses because it loses information about the member being accessed which we may later need to diagnose an inactive-member access. So this patch restricts the canonicalization accordingly. PR c++/114709 gcc/cp/ChangeLog: * constexpr.cc (cxx_fold_indirect_ref): Restrict object/offset canonicalization to RECORD_TYPE member accesses. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/constexpr-union8.C: New test. Reviewed-by: Jason Merrill Diff: --- gcc/cp/constexpr.cc | 3 +++ gcc/testsuite/g++.dg/cpp0x/constexpr-union8.C | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc index 302b266809f..2e83d24dfda 100644 --- a/gcc/cp/constexpr.cc +++ b/gcc/cp/constexpr.cc @@ -5799,6 +5799,9 @@ cxx_fold_indirect_ref (const constexpr_ctx *ctx, location_t loc, tree type, more folding opportunities. */ auto canonicalize_obj_off = [] (tree& obj, tree& off) { while (TREE_CODE (obj) == COMPONENT_REF + /* We need to preserve union member accesses so that we can + later properly diagnose accessing the wrong member. */ + && TREE_CODE (TREE_TYPE (TREE_OPERAND (obj, 0))) == RECORD_TYPE && (tree_int_cst_sign_bit (off) || integer_zerop (off))) { tree field = TREE_OPERAND (obj, 1); diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-union8.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-union8.C new file mode 100644 index 00000000000..34c264944b6 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-union8.C @@ -0,0 +1,8 @@ +// PR c++/114709 +// { dg-do compile { target c++11 } } + +struct T1 { int a, b; }; +struct T2 { int c; double d; }; +union U { T1 t1; T2 t2; }; + +constexpr int v = U{{1,2}}.t2.*&T2::c; // { dg-error "accessing 'U::t2'" }