From patchwork Wed Mar 11 15:46:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 1253029 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=uXfPRF+Y; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48cxD33KJDz9s3x for ; Thu, 12 Mar 2020 02:47:15 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3CD4E394200E; Wed, 11 Mar 2020 15:47:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3CD4E394200E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1583941633; bh=wxZ3L9N7+phdTE5iEFINfGl7UXk7epUtIMybb6p33Zk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=uXfPRF+YZ98pwhLF1CeFCpx59wLaP0dMYNZYq5qOxIfilSkrFZstVLFkgFpj6B4l8 t9T1ncRpNrhPUA51WLE4UZd+C9aja9e54ZPYLLNw3FoYCsIoJv8lSjvWNwMATEmzOi r8EuHoK7kntpFrgmMlli37DYVgqhwGMkWXggrFPU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by sourceware.org (Postfix) with ESMTP id 0726E3937420 for ; Wed, 11 Mar 2020 15:47:00 +0000 (GMT) Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-392-M-tlj67CP9iLlMG0D7H7tw-1; Wed, 11 Mar 2020 11:46:58 -0400 X-MC-Unique: M-tlj67CP9iLlMG0D7H7tw-1 Received: by mail-qt1-f200.google.com with SMTP id q7so1454745qtp.16 for ; Wed, 11 Mar 2020 08:46:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5DOSmsoWtJRkXynLoASHmxyj7FCskC/N6BuhbXOgWtc=; b=Hn1+Kk76M5gpUTP0t3Na+lQsMsj3t8YApe7AbK6qhK2drEfN1rf2SOrmYI1cHxrH3J QEpAcVn9sKf4xFzwqEmEYT0XcT5GtdGhfvWt9bXWM7XmHfysIzR6wMYz2uZAGUqZAp2v iupKfrL79VT2UHtrSLzSby/VHyP2JzYuQNa/9pxdoKD6iB8JCjZAnqaeML6TZHnT8Eag V+3Ona859YDTQSVR0+k9QZcbOF1BBpFGPezZE/x8Z8KO0LYdDgHQPWSzkNoMBwnp9Ppx wB4vIuvwzg8sm/IcWCqqx6H/EQvNZbVo06jqqSAbpLntkNIJsSveSC5/azdTAkX81DiU kKLg== X-Gm-Message-State: ANhLgQ115igXhXx5Cjv7aPg8r7SbGmQJNCy0dcnbriOCrSsAuLgAlFyX FwpmdRs8KmJlgw6aoZZFTTfn6M9DhPQ7AlzA05OJ2RGAjya/0DCe/FqMJgEaZiJ2TZgNBPMfMhI Myis8BEq1ojRoK8YiPQ== X-Received: by 2002:a37:cc5:: with SMTP id 188mr3537241qkm.161.1583941617166; Wed, 11 Mar 2020 08:46:57 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvQE9Poz7L+HYMS1w4DN5lnJf8YMnnjkrvC3PL6hAd5PIXrn/sLdPgwJ1HRrWoP2MthTvbKLw== X-Received: by 2002:a37:cc5:: with SMTP id 188mr3537212qkm.161.1583941616863; Wed, 11 Mar 2020 08:46:56 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id z19sm12426244qts.86.2020.03.11.08.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2020 08:46:56 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] libstdc++: Add a test that takes the split_view of a non-forward range Date: Wed, 11 Mar 2020 11:46:54 -0400 Message-Id: <20200311154654.837650-1-ppalka@redhat.com> X-Mailer: git-send-email 2.26.0.rc1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-27.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: Patrick Palka Cc: jwakely@redhat.com, libstdc++@gcc.gnu.org Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This adds a tests that verifies taking the split_view of a non-forward range works correctly. Doing so revealed a typo in one of _OuterIter's constructors. It also revealed that the default constructor of __gnu_test::test_range::iterator misbehaves, because by delegating to Iter(nullptr, nullptr) we perform a null-pointer deref at runtime in input_iterator_wrapper's constructor due to the ITERATOR_VERIFY check therein. Instead of delegating to this constructor it seems we can just inherit the protected default constructor, which does not contain this ITERATOR_VERIFY check. libstdc++-v3/ChangeLog: * include/std/ranges (split_view::_OuterIter::_OuterIter): Typo fix, 'address' -> 'std::__addressof'. * testsuite/std/ranges/adaptors/split.cc: Test taking the split_view of a non-forward input_range. * testsuite/util/testsuite_iterators.h (output_iterator_wrapper): Make default constructor protected instead of deleted, like with input_iterator_wrapper. (test_range::iterator): Add comment explaining that this type is used only when the underlying wrapper is input_iterator_wrapper or output_iterator_wrapper. Remove delegating defaulted constructor so that the inherited default constructor is used instead. --- libstdc++-v3/include/std/ranges | 2 +- .../testsuite/std/ranges/adaptors/split.cc | 20 +++++++++++++++++++ .../testsuite/util/testsuite_iterators.h | 14 ++++++++----- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 23396947ac3..f4faec463e8 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -2786,7 +2786,7 @@ namespace views constexpr explicit _OuterIter(_Parent& __parent) requires (!forward_range<_Base>) - : _M_parent(address(__parent)) + : _M_parent(std::__addressof(__parent)) { } constexpr diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/split.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/split.cc index abdbfb41d8b..fe895827fc5 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/split.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/split.cc @@ -27,6 +27,7 @@ using __gnu_test::test_range; using __gnu_test::forward_iterator_wrapper; +using __gnu_test::input_iterator_wrapper; namespace ranges = std::ranges; namespace views = std::ranges::views; @@ -133,6 +134,24 @@ test07() static_assert( noexcept(iter_swap(b, b2)) ); } +void +test08() +{ + char x[] = "the quick brown fox"; + test_range rx(x, x+sizeof(x)-1); + auto v = rx | views::split(' '); + auto i = v.begin(); + VERIFY( ranges::equal(*i, "the"sv) ); + ++i; + VERIFY( ranges::equal(*i, "quick"sv) ); + ++i; + VERIFY( ranges::equal(*i, "brown"sv) ); + ++i; + VERIFY( ranges::equal(*i, "fox"sv) ); + ++i; + VERIFY( i == v.end() ); +} + int main() { @@ -143,4 +162,5 @@ main() test05(); test06(); test07(); + test08(); } diff --git a/libstdc++-v3/testsuite/util/testsuite_iterators.h b/libstdc++-v3/testsuite/util/testsuite_iterators.h index a915c02248b..5be47f47915 100644 --- a/libstdc++-v3/testsuite/util/testsuite_iterators.h +++ b/libstdc++-v3/testsuite/util/testsuite_iterators.h @@ -124,6 +124,11 @@ namespace __gnu_test struct output_iterator_wrapper : public std::iterator { + protected: + output_iterator_wrapper() : ptr(0), SharedInfo(0) + { } + + public: typedef OutputContainer ContainerType; T* ptr; ContainerType* SharedInfo; @@ -135,8 +140,6 @@ namespace __gnu_test } #if __cplusplus >= 201103L - output_iterator_wrapper() = delete; - output_iterator_wrapper(const output_iterator_wrapper&) = default; output_iterator_wrapper& @@ -706,13 +709,14 @@ namespace __gnu_test template class Iter> class test_range { - // Adds default constructor to Iter if needed + // Exposes the protected default constructor of Iter if needed. This + // is needed only when Iter is input_iterator_wrapper or + // output_iterator_wrapper, because legacy forward iterators and beyond + // are already default constructible. struct iterator : Iter { using Iter::Iter; - iterator() : Iter(nullptr, nullptr) { } - using Iter::operator++; iterator& operator++() { Iter::operator++(); return *this; }