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 BA6873858D33 for ; Wed, 1 Feb 2023 00:11:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BA6873858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675210277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+vWQvE2SklwbSr8G/kz3lDk8FXkGVoa8/nludwmOec=; b=QOVOOVOO1nfAMPWEg4akA3NPzrixCb75iXErbw0IlZnl5CEqrawRGxFhwO/6KDpEdA+L3s bnC47tzXstEApVp7kj7ljw2prpU0277G6kfIXNAPkwhVeI/nAfRBjtErJneVy1kZ8usSMe KyeXpwz2Ubg+R+2kJGsiPuuBFXw9WJ8= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-427-lBP8BzEhO4q7YAZQK4L88Q-1; Tue, 31 Jan 2023 19:11:15 -0500 X-MC-Unique: lBP8BzEhO4q7YAZQK4L88Q-1 Received: by mail-qv1-f71.google.com with SMTP id ng1-20020a0562143bc100b004bb706b3a27so9356957qvb.20 for ; Tue, 31 Jan 2023 16:11:15 -0800 (PST) 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:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=z+vWQvE2SklwbSr8G/kz3lDk8FXkGVoa8/nludwmOec=; b=5tYHcAJV6ytR3cJB32ce/N+IvI7yoMfN3TfJzjz3yZmcISiimTPuIjFt8Wk/LaSKA9 aGkjsbPH4dpf6uqOnwejM340K0GPceyKlHeKh5sGZnxu9R6dR9iIiqcKnDl5iU5x+vcr JGQYp9PAhEs+maZJweUnTfB/nVvaCl+1Lgn45SOZYkeH6JP4PJaA4TJI+34i9qKXDQh+ XpCMpaDMHJqslpj7Ic7FbM3cqCICaNUSJ/L0Rtarn7o0+NfiF4cqRWbgyRglfZnkVQwv Lx9fMZ1A7E/yPYcqBOPXhCtWQr8HUJQdnrR6q1LIoFAvror0NLIJz/o9zEyEV/ZD3e8h KJeA== X-Gm-Message-State: AO0yUKVREjPdKcv2Skp0SbKyGwaeJL5dEqlXXIu/Uz46QCjH5BPX7rVG E/coF4FMM9lu44MbvhY0XLXvGRc76Ri70s24q6GHM02lxywS+TBEf/wcPifSACfGfl/ULzmOIsX 6XqpFAI+btPD7WCC753Hbl9BLQxfOqi9roAZGJnH4Y/DZaXCG0LlGVyaff5oZQIXQIQ== X-Received: by 2002:a05:622a:58c:b0:3b9:a6be:56f6 with SMTP id c12-20020a05622a058c00b003b9a6be56f6mr8515606qtb.26.1675210274917; Tue, 31 Jan 2023 16:11:14 -0800 (PST) X-Google-Smtp-Source: AK7set8xU6yvAXbTep7Vqm05zdPy7GpnSpt0zlll+rzyjtDQWXmHu8EquaMAvRhnpHVWgZmfDSzXKg== X-Received: by 2002:a05:622a:58c:b0:3b9:a6be:56f6 with SMTP id c12-20020a05622a058c00b003b9a6be56f6mr8515571qtb.26.1675210274459; Tue, 31 Jan 2023 16:11:14 -0800 (PST) Received: from jason.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 s39-20020a05622a1aa700b003a7e38055c9sm10826965qtc.63.2023.01.31.16.11.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 16:11:13 -0800 (PST) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: aggregate base and TARGET_EXPR_ELIDING_P [PR108559] Date: Tue, 31 Jan 2023 19:11:11 -0500 Message-Id: <20230201001111.1045847-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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.5 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 List-Id: Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- We also need to split up a CONSTRUCTOR in cp_genericize_init if we need to add extra copy constructor calls to deal with CWG2403. PR c++/108559 gcc/cp/ChangeLog: * cp-gimplify.cc (any_non_eliding_target_exprs): New. (cp_genericize_init): Check it. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/aggr-base13.C: New test. --- gcc/cp/cp-gimplify.cc | 22 +++++++++++++++++++--- gcc/testsuite/g++.dg/cpp1z/aggr-base13.C | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1z/aggr-base13.C diff --git a/gcc/cp/cp-gimplify.cc b/gcc/cp/cp-gimplify.cc index a35cedd05cc..9929d29981a 100644 --- a/gcc/cp/cp-gimplify.cc +++ b/gcc/cp/cp-gimplify.cc @@ -893,6 +893,21 @@ omp_cxx_notice_variable (struct cp_genericize_omp_taskreg *omp_ctx, tree decl) } } +/* True if any of the element initializers in CTOR are TARGET_EXPRs that are + not expected to elide, e.g. because unsafe_copy_elision_p is true. */ + +static bool +any_non_eliding_target_exprs (tree ctor) +{ + for (const constructor_elt &e : *CONSTRUCTOR_ELTS (ctor)) + { + if (TREE_CODE (e.value) == TARGET_EXPR + && !TARGET_EXPR_ELIDING_P (e.value)) + return true; + } + return false; +} + /* If we might need to clean up a partially constructed object, break down the CONSTRUCTOR with split_nonconstant_init. Also expand VEC_INIT_EXPR at this point. If initializing TO with FROM is non-trivial, overwrite *REPLACE with @@ -904,10 +919,11 @@ cp_genericize_init (tree *replace, tree from, tree to) tree init = NULL_TREE; if (TREE_CODE (from) == VEC_INIT_EXPR) init = expand_vec_init_expr (to, from, tf_warning_or_error); - else if (flag_exceptions - && TREE_CODE (from) == CONSTRUCTOR + else if (TREE_CODE (from) == CONSTRUCTOR && TREE_SIDE_EFFECTS (from) - && TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (from))) + && ((flag_exceptions + && TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (from))) + || any_non_eliding_target_exprs (from))) { to = cp_stabilize_reference (to); replace_placeholders (from, to); diff --git a/gcc/testsuite/g++.dg/cpp1z/aggr-base13.C b/gcc/testsuite/g++.dg/cpp1z/aggr-base13.C new file mode 100644 index 00000000000..c4c7ee0e8f0 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/aggr-base13.C @@ -0,0 +1,19 @@ +// PR c++/108559 +// { dg-do compile { target c++17 } } + +struct A { + int g = 0; + + A() {} + A(const A&) {} +}; + +struct B : A {}; + +A u() { return A{}; } + +int bug() { return B{u()}.g; } + +int main() { + return 0; +} base-commit: a9fbc6687faa09bf045c0fcee7960b7fef796fcc -- 2.31.1