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 7629C383801F for ; Fri, 6 May 2022 22:57:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7629C383801F Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-178-VzFv8I2fPPerlI8zk8d7ew-1; Fri, 06 May 2022 18:57:01 -0400 X-MC-Unique: VzFv8I2fPPerlI8zk8d7ew-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7E6E8101AA42; Fri, 6 May 2022 22:57:01 +0000 (UTC) Received: from localhost (unknown [10.33.36.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45DA720296A9; Fri, 6 May 2022 22:57:01 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed 2/2] libstdc++: Simplify std::normal_distribution equality operator Date: Fri, 6 May 2022 23:56:59 +0100 Message-Id: <20220506225659.3368784-2-jwakely@redhat.com> In-Reply-To: <20220506225659.3368784-1-jwakely@redhat.com> References: <20220506225659.3368784-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.4 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_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 May 2022 22:57:04 -0000 Tested powerpc64le-linux, pushed to trunk. -- >8 -- libstdc++-v3/ChangeLog: * include/bits/random.tcc (operator==): Only check normal_distribution::_M_saved_available once. * testsuite/26_numerics/random/normal_distribution/operators/equal.cc: Check equality after state changes. * testsuite/26_numerics/random/pr60037-neg.cc: Adjust dg-error lineno. --- libstdc++-v3/include/bits/random.tcc | 10 +--------- .../normal_distribution/operators/equal.cc | 20 +++++++++++++++++++ .../26_numerics/random/pr60037-neg.cc | 2 +- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc index 87a16a21336..cb1d3675783 100644 --- a/libstdc++-v3/include/bits/random.tcc +++ b/libstdc++-v3/include/bits/random.tcc @@ -1907,15 +1907,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { if (__d1._M_param == __d2._M_param && __d1._M_saved_available == __d2._M_saved_available) - { - if (__d1._M_saved_available - && __d1._M_saved == __d2._M_saved) - return true; - else if(!__d1._M_saved_available) - return true; - else - return false; - } + return __d1._M_saved_available ? __d1._M_saved == __d2._M_saved : true; else return false; } diff --git a/libstdc++-v3/testsuite/26_numerics/random/normal_distribution/operators/equal.cc b/libstdc++-v3/testsuite/26_numerics/random/normal_distribution/operators/equal.cc index a3435232961..81534e95797 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/normal_distribution/operators/equal.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/normal_distribution/operators/equal.cc @@ -34,8 +34,28 @@ test01() VERIFY( !(u == v) ); } +void +test02() +{ + std::normal_distribution u(5.0, 2.0), v(u); + VERIFY( u == v ); + u.reset(); + VERIFY( u == v ); + + std::minstd_rand0 g1, g2; + (void) u(g1); // u._M_saved_available = true + VERIFY( !(u == v) ); + (void) v(g2); // v._M_saved_available = true + VERIFY( u == v ); + u.reset(); // u._M_saved_available = false + VERIFY( !(u == v) ); + v.reset(); // v._M_saved_available = false + VERIFY( u == v ); +} + int main() { test01(); + test02(); return 0; } diff --git a/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc b/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc index 3ab9c44232e..c58f480640f 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc @@ -12,4 +12,4 @@ auto x = std::generate_canonical