From patchwork Wed Dec 13 16:47:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 82074 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 9BC54385C306 for ; Wed, 13 Dec 2023 16:48:05 +0000 (GMT) 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 1610A3858C78 for ; Wed, 13 Dec 2023 16:47:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1610A3858C78 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 1610A3858C78 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=1702486070; cv=none; b=aOtqIwPEtO1Dtf4Qnp2CavY9CYkwCAeiUKvtSsL4DiqV3jxswWL1f+LE4u3VsqCLLEjdJDximsTP49oyJgIW4QbGJeMaF8g8KL+ck1j0WzdMGZVBIOOsTlkhbGCx+HTp5xKgcns9VFh122JGF4BAijSUIzqvw5xQMXvKMW/Cv1c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702486070; c=relaxed/simple; bh=dS0TCR1zFP0M+KGsMwivovgADltQEygJgqKTN6f+6VA=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=U2WAgwLLzcejctPedbuShcLKHrgRFg4bwZYfjo33nd5dhzL55PR4aPyhoX8ybHptnr3TQNN/g4d/NpoXXJALCQh2LMkZ4nO0P2mM1YDfKbUQDOfzPLM5msPHrLKhXI3eUUwuk9g3WqlKli8VuRceVDXEgrnxL2MkLFOhy+2+OQ0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702486067; 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: in-reply-to:in-reply-to:references:references; bh=3+D57GauHLjJc6H9ZRRGNP5ni/6p5Lo4jPEWCLUe7oI=; b=C26pkQ0lk+dwnrXMV9oEFP6RNqKltYAz54lZVZl+vhj4TvDq3CZUiVuh8Kptt8uJiN7m2m 4ffOMAMnYOJYBhOcNIq7V/6R1C+Pa2Dnz6plImORf2HMP1xkkZ/wJj2ELUDO+qEryeLeMd JqezuQTygCEVnOMKifFAWSaiVP/5qIE= 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_256_GCM_SHA384) id us-mta-549-hTVDjdAbMyup9wnBqGpNWA-1; Wed, 13 Dec 2023 11:47:44 -0500 X-MC-Unique: hTVDjdAbMyup9wnBqGpNWA-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-67ee1ca3b05so34629576d6.2 for ; Wed, 13 Dec 2023 08:47:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702486064; x=1703090864; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3+D57GauHLjJc6H9ZRRGNP5ni/6p5Lo4jPEWCLUe7oI=; b=Y8+L9/xiwaozRAWpPS5sLMhRUgyhBi2J0AWYfD4xLh7TjM8WEpN8qHbuy0Gq2//9qt xhPru28xkQllJw6vgEftaYUAf3E4tQF1jTCJpsun7UU5r+lFuWFxrkip6lE4EefCbcCe Hvx5n424BZ7ByCwh9OMd/ACwpzg5IHOJpb8Fw2o4WEE3Cdvq2zxRgGkUgzHf3fiBDRZp JL1VKbK1peGLzkx9/uqUrFusKureoiE+8zbivh1qiWWf5174QM6pVWnC0+HwaJQm+FaV hHqXEziRNE0wNxmQSuSDx0tM0i/z9jDa2Upl81uBrDa630Orfcgyn2wWXGxFWSPxsqbJ tcPA== X-Gm-Message-State: AOJu0Yx4oc4gEmV4ADbvMX020qOfMqas9IiA4IRVM4hqW1LgdLwskkso 7RadGkjxRMdD5GVu1ZDsC1DW2CMFENbLubDHRTaSoUn9twut8xO4A1yc3M3wjZjGS1bf87s3gvW 2tG0ARRGZFBehJMLTbnpNPd1+uh8OjDEC4J0VAwxbTDyfwu9vXzhXCjq7SPKXdh/22RMG7lkCZg == X-Received: by 2002:a05:6214:518c:b0:67f:4e8:c80 with SMTP id kl12-20020a056214518c00b0067f04e80c80mr151813qvb.119.1702486063814; Wed, 13 Dec 2023 08:47:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IGoryS5in1mOPduddMDEglquIr0enV6CTaiCZ9ZFOefR6K6be4RLOmmkA6Aych1MjUjjyZ2Dg== X-Received: by 2002:a05:6214:518c:b0:67f:4e8:c80 with SMTP id kl12-20020a056214518c00b0067f04e80c80mr151799qvb.119.1702486063420; Wed, 13 Dec 2023 08:47:43 -0800 (PST) Received: from jason.com (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id j25-20020a05620a0a5900b0077f37896f24sm4613249qka.97.2023.12.13.08.47.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:47:42 -0800 (PST) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed 1/4] c++: copy location to AGGR_INIT_EXPR Date: Wed, 13 Dec 2023 11:47:37 -0500 Message-Id: <20231213164740.1591535-1-jason@redhat.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.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_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_WEB, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- When building an AGGR_INIT_EXPR from a CALL_EXPR, we shouldn't lose location information. gcc/cp/ChangeLog: * tree.cc (build_aggr_init_expr): Copy EXPR_LOCATION. gcc/testsuite/ChangeLog: * g++.dg/cpp1y/constexpr-nsdmi7b.C: Adjust line. * g++.dg/template/copy1.C: Likewise. --- gcc/cp/tree.cc | 1 + gcc/testsuite/g++.dg/cpp1y/constexpr-nsdmi7b.C | 4 ++-- gcc/testsuite/g++.dg/template/copy1.C | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) base-commit: d2b269ce30d77dbfc6c28c75887c330d4698b132 diff --git a/gcc/cp/tree.cc b/gcc/cp/tree.cc index da4d5c51f07..c4e41fd7b5c 100644 --- a/gcc/cp/tree.cc +++ b/gcc/cp/tree.cc @@ -689,6 +689,7 @@ build_aggr_init_expr (tree type, tree init) CALL_EXPR_OPERATOR_SYNTAX (rval) = CALL_EXPR_OPERATOR_SYNTAX (init); CALL_EXPR_ORDERED_ARGS (rval) = CALL_EXPR_ORDERED_ARGS (init); CALL_EXPR_REVERSE_ARGS (rval) = CALL_EXPR_REVERSE_ARGS (init); + SET_EXPR_LOCATION (rval, EXPR_LOCATION (init)); } else rval = init; diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-nsdmi7b.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-nsdmi7b.C index a410e482664..586ee54124c 100644 --- a/gcc/testsuite/g++.dg/cpp1y/constexpr-nsdmi7b.C +++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-nsdmi7b.C @@ -20,8 +20,8 @@ bar() { A a = foo(); a.p->n = 5; - return a; -} // { dg-error "non-.constexpr." "" { target c++20_down } } + return a; // { dg-error "non-.constexpr." "" { target c++20_down } } +} constexpr int baz() diff --git a/gcc/testsuite/g++.dg/template/copy1.C b/gcc/testsuite/g++.dg/template/copy1.C index eacd9e2c025..7e0a3805a77 100644 --- a/gcc/testsuite/g++.dg/template/copy1.C +++ b/gcc/testsuite/g++.dg/template/copy1.C @@ -6,10 +6,10 @@ struct A { - // { dg-error "reference" "" { target c++14_down } .+1 } A(A&); // { dg-message "A::A" "" { target c++14_down } } template A(T); // { dg-message "A::A" "" { target c++14_down } } }; +// { dg-error "reference" "" { target c++14_down } .+1 } A a = 0; // { dg-error "no match" "" { target c++14_down } }