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 77556394740E for ; Tue, 15 Nov 2022 23:25:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 77556394740E 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=1668554740; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ewkIc8vEe0Dh6WlM5U7MJBbPLrDj75WKg1OdhqjyKBM=; b=R91wdl6+RCnmB0lAF7Ss1KA2Lc5FaQKKw+NOkVi8K6gFS2AWZECNyetdSTpnC8askTPrVX JOCevCwVZHUAAT0spQxOitczex5EOMz+vF+6LHQkJPyZ/PWm9O3TEtWfVbdewdhRRyMbwh rG7CtkFJTXjp3hNMvcavU02gPV+Hd5g= 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_128_GCM_SHA256) id us-mta-6-j3ESTNbvOuuYRVPAIA3DqQ-1; Tue, 15 Nov 2022 18:25:38 -0500 X-MC-Unique: j3ESTNbvOuuYRVPAIA3DqQ-1 Received: by mail-qk1-f198.google.com with SMTP id de43-20020a05620a372b00b006fae7e5117fso15245888qkb.6 for ; Tue, 15 Nov 2022 15:25:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ewkIc8vEe0Dh6WlM5U7MJBbPLrDj75WKg1OdhqjyKBM=; b=rc+AyK3wws14j2fxZvPm7CqEYTRlve94nr13T2z2O78CKzIuoMB+yI6uDPC6B5QFH9 w19nHj0GgUdnivaQPbxIsXn3Zo5RXTZOO/PUwSfb+AVR2Xrqelie/Co/J5a04zaOpHWO QwQa4fudt/iJoKsiVo8n/28a0hDTlNYLCLL5Wj4KFhsx/lsCHEpTKFrxwh6vq9Cvo+d0 kujE0o3+/Zfu/pXcYTz89+Kik/LO3LCM8ZyT81nOCX0eXmoWbFBtl2q/qYWF6B896ueB mdHjzz5YOpgVEic3rcy3B/hLRuwjWRuj9UWpVCKMotFMLEpw6YWxroo/Z1WlWjIoXh0h O6+A== X-Gm-Message-State: ANoB5pnNb4/DMXHJDRa+iVumhL0Mqe0jVglFEag3IKYQltJa7D1dd1xR G0/K4TzVwoVJ64Hk6jCxvGbrf+fg2Eid0wJ5TRhh+WMHUbk0eix88z61C4abBssD+ylWmLmZ98X ZfjeLkXK9P9DHL5VNwg== X-Received: by 2002:a05:622a:6186:b0:3a4:ec88:4985 with SMTP id hh6-20020a05622a618600b003a4ec884985mr18572994qtb.521.1668554737716; Tue, 15 Nov 2022 15:25:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf7qrVHiOca8Y+U4ZV/qEsKrbZxpwk1TZDXGBujKWXKCNw/X8OO0toHjCbhaC0mYg7YVBNB/zQ== X-Received: by 2002:a05:622a:6186:b0:3a4:ec88:4985 with SMTP id hh6-20020a05622a618600b003a4ec884985mr18572978qtb.521.1668554737299; Tue, 15 Nov 2022 15:25:37 -0800 (PST) Received: from [192.168.1.101] (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 r30-20020ae9d61e000000b006fa2b1c3c1esm8896305qkk.58.2022.11.15.15.25.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Nov 2022 15:25:36 -0800 (PST) Message-ID: <672c8afb-000f-66a3-5c0a-011dc486e05e@redhat.com> Date: Tue, 15 Nov 2022 18:25:35 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH] c++, v2: Implement CWG 2654 - Un-deprecation of compound volatile assignments To: Jakub Jelinek Cc: gcc-patches@gcc.gnu.org References: From: Jason Merrill In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,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: On 11/13/22 01:43, Jakub Jelinek wrote: > On Fri, Nov 11, 2022 at 08:43:04AM +0100, Jakub Jelinek wrote: >> Again, because stage1 close is near, posting the following patch >> to implement CWG 2654. >> >> Ok for trunk if it passes bootstrap/regtest and is voted into C++23 >> and C++20 as a DR? > > Here is an updated patch that passed bootstrap/regtest, difference > is just a few further testsuite tweaks. OK. > 2022-11-13 Jakub Jelinek > > * typeck.cc (cp_build_modify_expr): Implement CWG 2654 > - Un-deprecation of compound volatile assignments. Remove > -Wvolatile warning about compound volatile assignments. > > * g++.dg/cpp2a/volatile1.C (fn2, fn3, racoon): Adjust expected > diagnostics. > * g++.dg/cpp2a/volatile3.C (fn2, fn3, racoon): Likewise. > * g++.dg/cpp2a/volatile5.C (f): Likewise. > * g++.dg/ext/vector25.C (foo): Don't expect a warning. > * g++.dg/cpp1y/new1.C (test_unused): Likewise. > > --- gcc/cp/typeck.cc.jj 2022-11-09 11:22:42.617628059 +0100 > +++ gcc/cp/typeck.cc 2022-11-10 23:19:00.394228067 +0100 > @@ -9513,19 +9513,6 @@ cp_build_modify_expr (location_t loc, tr > && MAYBE_CLASS_TYPE_P (TREE_TYPE (lhstype))) > || MAYBE_CLASS_TYPE_P (lhstype))); > > - /* An expression of the form E1 op= E2. [expr.ass] says: > - "Such expressions are deprecated if E1 has volatile-qualified > - type and op is not one of the bitwise operators |, &, ^." > - We warn here rather than in cp_genericize_r because > - for compound assignments we are supposed to warn even if the > - assignment is a discarded-value expression. */ > - if (modifycode != BIT_AND_EXPR > - && modifycode != BIT_IOR_EXPR > - && modifycode != BIT_XOR_EXPR > - && (TREE_THIS_VOLATILE (lhs) || CP_TYPE_VOLATILE_P (lhstype))) > - warning_at (loc, OPT_Wvolatile, > - "compound assignment with %-qualified left " > - "operand is deprecated"); > /* Preevaluate the RHS to make sure its evaluation is complete > before the lvalue-to-rvalue conversion of the LHS: > > --- gcc/testsuite/g++.dg/cpp2a/volatile1.C.jj 2022-08-16 13:15:22.739043862 +0200 > +++ gcc/testsuite/g++.dg/cpp2a/volatile1.C 2022-11-10 23:23:18.949717772 +0100 > @@ -74,17 +74,17 @@ fn2 () > decltype(i = vi = 42) x3 = i; > > // Compound assignments. > - vi += i; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > - vi -= i; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > - vi %= i; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > + vi += i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > + vi -= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > + vi %= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > vi ^= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > vi |= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > vi &= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > - vi /= i; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > + vi /= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > vi = vi += 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > vi += vi = 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > i *= vi; > - decltype(vi -= 42) x2 = vi; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > + decltype(vi -= 42) x2 = vi; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > > // Structured bindings. > int a[] = { 10, 5 }; > @@ -107,12 +107,12 @@ fn3 () > volatile U u; > u.c = 42; > i = u.c = 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > - u.c += 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > + u.c += 42; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > > volatile T t; > t.a = 3; > j = t.a = 3; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > - t.a += 3; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > + t.a += 3; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > > volatile int *src = &i; > *src; // No assignment, don't warn. > @@ -135,7 +135,7 @@ void raccoon () > volatile T t, u; > t = 42; > u = t = 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > - t += 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" "" { target c++20 } } > + t += 42; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > t &= 42; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > } > > --- gcc/testsuite/g++.dg/cpp2a/volatile3.C.jj 2022-08-16 13:15:22.753043682 +0200 > +++ gcc/testsuite/g++.dg/cpp2a/volatile3.C 2022-11-10 23:24:24.781823998 +0100 > @@ -75,17 +75,17 @@ fn2 () > decltype(i = vi = 42) x3 = i; > > // Compound assignments. > - vi += i; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > - vi -= i; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > - vi %= i; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > + vi += i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > + vi -= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > + vi %= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > vi ^= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > vi |= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > vi &= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > - vi /= i; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > + vi /= i; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > vi = vi += 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > vi += vi = 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > i *= vi; > - decltype(vi -= 42) x2 = vi; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > + decltype(vi -= 42) x2 = vi; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > > // Structured bindings. > int a[] = { 10, 5 }; > @@ -108,12 +108,12 @@ fn3 () > volatile U u; > u.c = 42; > i = u.c = 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > - u.c += 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > + u.c += 42; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > > volatile T t; > t.a = 3; > j = t.a = 3; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > - t.a += 3; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > + t.a += 3; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > > volatile int *src = &i; > *src; // No assignment, don't warn. > @@ -136,7 +136,7 @@ void raccoon () > volatile T t, u; > t = 42; > u = t = 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > - t += 42; // { dg-warning "assignment with .volatile.-qualified left operand is deprecated" } > + t += 42; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > t &= 42; // { dg-bogus "assignment with .volatile.-qualified left operand is deprecated" } > } > > --- gcc/testsuite/g++.dg/cpp2a/volatile5.C.jj 2022-08-16 13:15:22.778043359 +0200 > +++ gcc/testsuite/g++.dg/cpp2a/volatile5.C 2022-11-10 23:25:07.445244776 +0100 > @@ -7,7 +7,7 @@ void > f (bool b) > { > (b ? x : y) = 1; > - (b ? x : y) += 1; // { dg-warning "compound assignment" "" { target c++20 } } > + (b ? x : y) += 1; // { dg-bogus "compound assignment" } > z = (b ? x : y) = 1; // { dg-warning "using value of assignment" "" { target c++20 } } > ((z = 2) ? x : y) = 1; // { dg-warning "using value of assignment" "" { target c++20 } } > (b ? (x = 2) : y) = 1; // { dg-warning "using value of assignment" "" { target c++20 } } > --- gcc/testsuite/g++.dg/ext/vector25.C.jj 2020-01-14 20:02:46.842608950 +0100 > +++ gcc/testsuite/g++.dg/ext/vector25.C 2022-11-12 09:18:20.654702399 +0100 > @@ -2,5 +2,5 @@ volatile int i __attribute__((vector_siz > > void foo() > { > - i += i; // { dg-warning "deprecated" "" { target c++2a } } > + i += i; // { dg-bogus "deprecated" } > } > --- gcc/testsuite/g++.dg/cpp1y/new1.C.jj 2020-09-24 11:58:14.049056885 +0200 > +++ gcc/testsuite/g++.dg/cpp1y/new1.C 2022-11-12 09:16:49.349943682 +0100 > @@ -65,7 +65,7 @@ void > test_unused() { > volatile double d = 0.0; > double *p = new double (); > - d += 1.0; // { dg-warning "deprecated" "" { target c++2a } } > + d += 1.0; > delete p; > } > > > > Jakub >