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.133.124]) by sourceware.org (Postfix) with ESMTPS id AD9303858417 for ; Wed, 13 Dec 2023 18:05:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AD9303858417 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 AD9303858417 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702490731; cv=none; b=baG/+DMz0TJ9b1DzTMPHp/UmXT23geFfM5K8mBaXJro2xYJb2EI685urMduauZBtOM9/6mh6tmdw9M3507nbeU+9NSTtibytYQzajpdk4dZzlCotf8A6GmuBlM7qOY6ztRra208cL65BCsDDdTxEx9sTQpuK5kvrze+LEBDhc38= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702490731; c=relaxed/simple; bh=RcD2O57S5mQbGOqvNv7zzwp2lgcphQShV4cb9Si5Ylk=; h=DKIM-Signature:From:Date:To:Subject:Message-ID:MIME-Version; b=aaR/SwmUGL0HDUXkaewV4h712ivvubcVtbdihEyq6LYeuqlLcTysvgyhU+K+QHAgQ4xI4ROmG8KgWS9CRvaV0ru55dIjvU6DMVNUIl9i8hKt9tBu+KgYGs4wi4a/moNCVzzou+BgkZeeGEiMpejiVl8Gq1ce4bcssIiJv4TJvUQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702490721; 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=vCsJGeHUeFP6gO8ATOyjjJjHNAKL3W0PR8F4qxk/tb4=; b=KzCIZu4wtCulMRZCWIk+gvJYsmN7co/LiK/YXY65DsMJc7fgy8pWGPf8Ce/eE9JSF/RsZX wO4K/zdU2XTuoEHeT3UJD2Zu17jzO4qxk80/ycSXJBvVnbvexopt2TWJqFZAVbhqZt9eOz FKEJjxAmximLhax/Doarhzlxgl+j80U= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-130-rnR9PrHoO-inZ_hD0AV0cw-1; Wed, 13 Dec 2023 13:05:20 -0500 X-MC-Unique: rnR9PrHoO-inZ_hD0AV0cw-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-67eee0fe878so20916586d6.3 for ; Wed, 13 Dec 2023 10:05:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702490719; x=1703095519; 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=vCsJGeHUeFP6gO8ATOyjjJjHNAKL3W0PR8F4qxk/tb4=; b=kfuL85DDk7L5xA/pik9ATrCzDoP+vb6RDHW2Vwu298ZtM479R6HmTxrbVC+YeShVTB /kT5tUiuOZLPHoVonovNec7E0WD/DaAq6dACsFBbAH2JTgBBI5BT+PB39Cx0XM6hDsgs TNlr00n0erdigz/SyEgcTOcNAiprugNRUx9yFgnDmrnR7r2PNszGJ5TVJCVF59bSJThc ti2PuHvX8UrgBPYIMG9uY4BsYVuqbSngsJuo9VERGcjz4VXrj/kpDvujDP2e7qtrEEed kxGOGanYDZnjmLxU2XoAIPmvGRIs7E4yxPwwjlNngBtyxXwarDCXLRL7bEpZY+qWqv2C 0/Ig== X-Gm-Message-State: AOJu0YwhlwB5hfzWggBI0pkXol13nYZtHgMNZ3EVMvLlVtLKTLY2nR09 RIjySPEN8DC47WXmjdSC6jJPk+D8vYFr7A3lmJRi7ZcL9xrpRSesLOMHmlti3V0cfFr+pJUYKKe 1rnJtKG3zpuB5QHRefA== X-Received: by 2002:a05:6214:4952:b0:67a:909e:cd07 with SMTP id pe18-20020a056214495200b0067a909ecd07mr8828693qvb.21.1702490719688; Wed, 13 Dec 2023 10:05:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IH2ZlSsLc98G26aELEmoZYe838wV+OAYjZFPjmQSAy/EZsQdmBZgApw58qtwNT/3pw+GYp6jg== X-Received: by 2002:a05:6214:4952:b0:67a:909e:cd07 with SMTP id pe18-20020a056214495200b0067a909ecd07mr8828680qvb.21.1702490719365; Wed, 13 Dec 2023 10:05:19 -0800 (PST) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id i12-20020a0cfccc000000b0067aa8e67fc5sm1242414qvq.84.2023.12.13.10.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 10:05:19 -0800 (PST) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Wed, 13 Dec 2023 13:05:18 -0500 (EST) To: Jason Merrill cc: gcc-patches@gcc.gnu.org Subject: Re: [pushed 1/4] c++: copy location to AGGR_INIT_EXPR In-Reply-To: <20231213164740.1591535-1-jason@redhat.com> Message-ID: <8de55f6d-8e73-1fe7-e4d6-bb028490f8a3@idea> References: <20231213164740.1591535-1-jason@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_H3,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 Wed, 13 Dec 2023, Jason Merrill wrote: > 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. I made a similar change in the past which caused the debug regression PR96997 which I fixed by reverting the change in r11-7263-g78a6d0e30d7950 (didn't do much deeper analysis than that). Unfortunately it seems this regression is back now. > > 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(-) > > 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 } } > > > base-commit: d2b269ce30d77dbfc6c28c75887c330d4698b132 > -- > 2.39.3 > >