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 22AE23858D20 for ; Tue, 14 Nov 2023 15:43:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 22AE23858D20 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 22AE23858D20 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=1699976599; cv=none; b=UaYrVTHbXnn4lYnJ0tD5AufE7kIryTXN66zrf/Ku9B1SEKJbTpLCBdn+SzKGUmGuo5NOxQwXpEj5Jee1Z091ob2EtcRV4EaRy0j3EwVONmkT8WgE0WrBTGuI//88gF1yuUUNxa/GFz61uIBBwJB6+IgzpHgVGn65PpRyb7m+zyI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699976599; c=relaxed/simple; bh=YfKFFtSXvAfo6F5vhEv00K5vsD/BhZVFVLTKI/4wZ4Y=; h=DKIM-Signature:From:Date:To:Subject:Message-ID:MIME-Version; b=YurhVIYgvaZSlEFZZfO9Oq8/2/gROtMtMiuILP/kMTKFj8kdd6BTVwO5VAEsti95wQeeF3uKWfMuRtwRYZtWgGAZiZPTC3txzgelfLCanrLK9bt1MhZn6CWSvs22edFsYvb0fjzqF4dyCS56rt6dgTiC/uiIeXuQtfvQ8CmIJNE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699976597; 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: in-reply-to:in-reply-to:references:references; bh=0F8QQX8JUiA9FNLj7p0fN7wj4/lQwtPkt0U0rEES6q0=; b=RWlsSalw8FdDbMGPgPeMsVm7MNlAlIPT7pp6EqwIemZX2HI+Mk7hsae/rMB4Jju2w0KklB f8C9T/J9hg7VoEC6TPdCepRO1NI1YvNoY7p6jMYQ5OAg5OFCfuPr1iC2E54ct+YUJSAex6 icv9uCTdfbgOk5Y+NSKeH1cIWJ2vw2U= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-441-GNKYiwZHOa6fgAGWLOljSA-1; Tue, 14 Nov 2023 10:43:08 -0500 X-MC-Unique: GNKYiwZHOa6fgAGWLOljSA-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-77bc8a94064so515226985a.0 for ; Tue, 14 Nov 2023 07:43:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699976587; x=1700581387; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0F8QQX8JUiA9FNLj7p0fN7wj4/lQwtPkt0U0rEES6q0=; b=TUjZW960qGhcWVrDAEfjanPPAx+kUkQJX9hMTAaBM7qHX/bi3j9cR7iQB+H7umdcqH viB+k6VcICMQw4s1PLzboJxP5eXT1Ns2oyvhbbJ4pH3fjMeoIEMGj1IVfdJjv9dugd1q un5CJEmErHp4MF9PON6t0jecW643MYcWOTjWYaJhyz6BPvfZtRV3N26y48AwTcoH72Uc BXoexPohIHQV/b95UsUcf/UfC1vCXkZIxxD9Bw7F3kTby6seyCvUDZaYKHskGTlUMhME sw+ke7F04IXXvlSfyPjCaAtcy51rHfg6U5bBJYWo5wnUP+pjW9c7x2Pt3pnxfmTzAG7K 9mag== X-Gm-Message-State: AOJu0YwG5cEan7pgSLUrv2KBMkUPLLQxE6N3WcoTvPcqvylLunTsQoNP aKLs8fbEt25sap+gTew/0nEh3SvHXh5zaqGYmrSNBN7jc2uaimusO2hcKAEhAnIsjJ3WLILE48p Y0dF21bwZBS3Y4OS0RQ== X-Received: by 2002:a05:620a:3193:b0:775:7996:3431 with SMTP id bi19-20020a05620a319300b0077579963431mr2916630qkb.52.1699976586903; Tue, 14 Nov 2023 07:43:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IEEPH9d1aT+kYiFe4hN7UKopItpB/kB1+tRpXwgmR9dYrxNjBfuWGs3pveTpRX36iCDlqzVig== X-Received: by 2002:a05:620a:3193:b0:775:7996:3431 with SMTP id bi19-20020a05620a319300b0077579963431mr2916613qkb.52.1699976586605; Tue, 14 Nov 2023 07:43:06 -0800 (PST) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id s27-20020a05620a031b00b0076cbcf8ad3bsm2727832qkm.55.2023.11.14.07.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 07:43:06 -0800 (PST) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Tue, 14 Nov 2023 10:43:05 -0500 (EST) To: Jason Merrill cc: Patrick Palka , gcc-patches@gcc.gnu.org Subject: Re: [PATCH] c++: non-dependent .* folding [PR112427] In-Reply-To: <8fd05dbf-f08d-441f-90c0-10ac6fe5f7a8@redhat.com> Message-ID: References: <20231108215904.2779753-1-ppalka@redhat.com> <375a6726-8998-4b6b-830f-32852ef116b1@redhat.com> <2fb218a2-713a-1a09-3c18-0f37ab359631@idea> <8fd05dbf-f08d-441f-90c0-10ac6fe5f7a8@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-13.8 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_H4,RCVD_IN_MSPIKE_WL,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 Fri, 10 Nov 2023, Jason Merrill wrote: > On 11/10/23 10:28, Patrick Palka wrote: > > On Fri, 10 Nov 2023, Patrick Palka wrote: > > > > > On Thu, 9 Nov 2023, Jason Merrill wrote: > > > > > > > On 11/8/23 16:59, Patrick Palka wrote: > > > > > Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK > > > > > for > > > > > trunk? > > > > > > > > > > -- >8 -- > > > > > > > > > > Here when building up the non-dependent .* expression, we crash from > > > > > fold_convert on 'b.a' due to this (templated) COMPONENT_REF having an > > > > > IDENTIFIER_NODE instead of FIELD_DECL operand that middle-end routines > > > > > expect. Like in r14-4899-gd80a26cca02587, this patch fixes this by > > > > > replacing the problematic piecemeal folding with a single call to > > > > > cp_fully_fold. > > > > > > > > > > PR c++/112427 > > > > > > > > > > gcc/cp/ChangeLog: > > > > > > > > > > * typeck2.cc (build_m_component_ref): Use cp_convert, build2 > > > > > and > > > > > cp_fully_fold instead of fold_build_pointer_plus and > > > > > fold_convert. > > > > > > > > > gcc/testsuite/ChangeLog: > > > > > > > > > > * g++.dg/template/non-dependent29.C: New test. > > > > > --- > > > > > gcc/cp/typeck2.cc | 5 ++++- > > > > > gcc/testsuite/g++.dg/template/non-dependent29.C | 13 +++++++++++++ > > > > > 2 files changed, 17 insertions(+), 1 deletion(-) > > > > > create mode 100644 gcc/testsuite/g++.dg/template/non-dependent29.C > > > > > > > > > > diff --git a/gcc/cp/typeck2.cc b/gcc/cp/typeck2.cc > > > > > index 309903afed8..208004221da 100644 > > > > > --- a/gcc/cp/typeck2.cc > > > > > +++ b/gcc/cp/typeck2.cc > > > > > @@ -2378,7 +2378,10 @@ build_m_component_ref (tree datum, tree > > > > > component, > > > > > tsubst_flags_t complain) > > > > > /* Build an expression for "object + offset" where offset is > > > > > the > > > > > value stored in the pointer-to-data-member. */ > > > > > ptype = build_pointer_type (type); > > > > > - datum = fold_build_pointer_plus (fold_convert (ptype, datum), > > > > > component); > > > > > + datum = cp_convert (ptype, datum, complain); > > > > > + datum = build2 (POINTER_PLUS_EXPR, ptype, > > > > > + datum, convert_to_ptrofftype (component)); > > > > > > > > We shouldn't need to build the POINTER_PLUS_EXPR at all in template > > > > context. > > > > OK with that change. > > > > > > Hmm, that seems harmless at first glance, but I noticed > > > build_min_non_dep (called from build_x_binary_op in this case) is > > > careful to propagate TREE_SIDE_EFFECTS of the given tree, and so eliding > > > POINTER_PLUS_EXPR here could potentially mean that the tree we > > > ultimately return from build_x_binary_op when in a template context has > > > TREE_SIDE_EFFECTS not set when it used to. Shall we still elide the > > > POINTER_PLUS_EXPR in a template context despite this? > > True, we would need build_min_non_dep to also get TREE_SIDE_EFFECTS from the > operands. That might be useful in general for similar situations? > > I also note that convert_to_ptrofftype uses fold_convert, so the new code > could have the same problem if the pointer to member operand is also a > COMPONENT_REF. Ah, makes sense... How does the following look then? I'm not sure if we still want to replace fold_build_pointer_plus with build2 if we're not going to use that code path in a template context? Bootstrapped and regtested on x86_64-pc-linux-gnu. -- >8 -- - Subject: [PATCH] c++: non-dependent .* operand folding [PR112427] Here when building up the non-dependent .* expression, we crash from fold_convert on 'b.a' due to this (templated) COMPONENT_REF having an IDENTIFIER_NODE instead of FIELD_DECL operand that middle-end routines expect. Like in r14-4899-gd80a26cca02587, this patch fixes this by replacing the problematic piecemeal folding with a single call to cp_fully_fold. Additionally, don't bother building POINTER_PLUS_EXPR in a template context. This means the returned non-dependent tree might not have TREE_SIDE_EFFECTS set when it used to, so we need to make build_min_non_dep compensate for this by propagating TREE_SIDE_EFFECTS from the original arguments like buildN and build_min do, which seems like a generally desirable thing to do anyway. PR c++/112427 gcc/cp/ChangeLog: * tree.cc (build_min_non_dep): Propagate TREE_SIDE_EFFECTS from the original arguments. (build_min_non_dep_call_vec): Likewise. * typeck2.cc (build_m_component_ref): Use cp_convert, build2 and cp_fully_fold instead of fold_build_pointer_plus and fold_convert. gcc/testsuite/ChangeLog: * g++.dg/template/non-dependent29.C: New test. --- gcc/cp/tree.cc | 11 ++++++++++- gcc/cp/typeck2.cc | 6 +++++- gcc/testsuite/g++.dg/template/non-dependent29.C | 13 +++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/non-dependent29.C diff --git a/gcc/cp/tree.cc b/gcc/cp/tree.cc index 417c92ba76f..dc4126f935c 100644 --- a/gcc/cp/tree.cc +++ b/gcc/cp/tree.cc @@ -3601,7 +3601,12 @@ build_min_non_dep (enum tree_code code, tree non_dep, ...) TREE_SIDE_EFFECTS (t) = TREE_SIDE_EFFECTS (non_dep); for (i = 0; i < length; i++) - TREE_OPERAND (t, i) = va_arg (p, tree); + { + tree x = va_arg (p, tree); + TREE_OPERAND (t, i) = x; + if (x && !TYPE_P (x)) + TREE_SIDE_EFFECTS (t) |= TREE_SIDE_EFFECTS (x); + } va_end (p); return convert_from_reference (t); @@ -3636,6 +3641,10 @@ build_min_non_dep_call_vec (tree non_dep, tree fn, vec *argvec) non_dep = TREE_OPERAND (non_dep, 0); TREE_TYPE (t) = TREE_TYPE (non_dep); TREE_SIDE_EFFECTS (t) = TREE_SIDE_EFFECTS (non_dep); + if (argvec) + for (tree x : *argvec) + if (x && !TYPE_P (x)) + TREE_SIDE_EFFECTS (t) |= TREE_SIDE_EFFECTS (x); return convert_from_reference (t); } diff --git a/gcc/cp/typeck2.cc b/gcc/cp/typeck2.cc index 309903afed8..a75f4f8c2d2 100644 --- a/gcc/cp/typeck2.cc +++ b/gcc/cp/typeck2.cc @@ -2378,7 +2378,11 @@ build_m_component_ref (tree datum, tree component, tsubst_flags_t complain) /* Build an expression for "object + offset" where offset is the value stored in the pointer-to-data-member. */ ptype = build_pointer_type (type); - datum = fold_build_pointer_plus (fold_convert (ptype, datum), component); + datum = cp_convert (ptype, datum, complain); + if (!processing_template_decl) + datum = build2 (POINTER_PLUS_EXPR, ptype, + datum, convert_to_ptrofftype (component)); + datum = cp_fully_fold (datum); datum = cp_build_fold_indirect_ref (datum); if (datum == error_mark_node) return error_mark_node; diff --git a/gcc/testsuite/g++.dg/template/non-dependent29.C b/gcc/testsuite/g++.dg/template/non-dependent29.C new file mode 100644 index 00000000000..41bd11ae6b4 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/non-dependent29.C @@ -0,0 +1,13 @@ +// PR c++/112427 + +struct A { int m; void f(); }; +struct B { A a; }; + +template +void f(B b) { + int A::*pd = &A::m; + b.a.*pd; + + void (A::*pf)() = &A::f; + (b.a.*pf)(); +} -- 2.43.0.rc1