From patchwork Tue Oct 19 18:29:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 46408 X-Patchwork-Delegate: jwakely.gcc@gmail.com 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 99EFD3858410 for ; Tue, 19 Oct 2021 18:30:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 99EFD3858410 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1634668202; bh=tvM1xHTpjZT/FQmIpidewMaWqYkutr6VpIxQM1Y8f74=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=ylyeuxb0kVz/MDgq8Oo/caZmSnNJwI2CnvPvhzVgL6WQ6xGPtMfD/GbyZdmonf5gh XokobKH5EYhYL/J1BbrESiexPixHCLjJ/BRLeXeOkHAwPHawRqhdRi8J6dLJNe1tTo vQzFBukPNrAqxQ5EdHfv5Ye4zVmNZHS1xCnn6YVc= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id 64D503858C2C for ; Tue, 19 Oct 2021 18:29:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 64D503858C2C 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-550-ovK3H2HxPf6CznAvgyfGlg-1; Tue, 19 Oct 2021 14:29:32 -0400 X-MC-Unique: ovK3H2HxPf6CznAvgyfGlg-1 Received: by mail-qt1-f200.google.com with SMTP id 92-20020aed3065000000b002a7a7c0fcd0so526738qte.17 for ; Tue, 19 Oct 2021 11:29:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tvM1xHTpjZT/FQmIpidewMaWqYkutr6VpIxQM1Y8f74=; b=Ft1i+DjkFzUvDrb3I5az5UcE+webCiVRikMuezyCswB7JGsL3wGC8QFafJrIlgoJc9 P2zZb/tmKV4BY+lo+UAKo4fXtLzZLk/MRnL85gQdbZ2n3jnT0dL9jEC5BBJ9eedW2KQp j95qC8j4grZhznZ8MQjfJboXvkKX43aOB1gZawunKtcV0ondrZOCfmblhliatB5oD9/M BZtQVgetl314p4n1Bv8N0Yc1HSC1t88aZPZimMKQcdwqjB03zDNRcAuY2aaDOsyB2GvP 3clXija2VEn/QlSDJNbg4dPI2cwyEOGXatpq21to8XXNnv4idekF/+XIxrJKFyFqTa6a 4GXQ== X-Gm-Message-State: AOAM530zDNr/gOJCUO9YQrKyWVqTramz+QBLEvyFUgeWJGX+342buNAa pYDBHUjInfHbI2E4Ppei7T6tyBo3sHoDaC8bYsTK8dFhMD351RNaIYA5bfqACj3w4M4M85YQ69a ikRPkQyTIpkLCLC1BFQGHMBFtOl7OcfPnZjSGbekqOspe8d1jHqWFTD7VRh+eaMKVh90= X-Received: by 2002:a0c:e409:: with SMTP id o9mr1511194qvl.53.1634668171993; Tue, 19 Oct 2021 11:29:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznvTeHOfBZ7NrFccKptVF5WpPHugEiO11cSgsykVzE013UeNWRTLnAx+Nxl2GNeXsDYUtTNw== X-Received: by 2002:a0c:e409:: with SMTP id o9mr1511178qvl.53.1634668171770; Tue, 19 Oct 2021 11:29:31 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id m14sm7875422qtq.74.2021.10.19.11.29.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 11:29:31 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] libstdc++: Implement LWG 3470 change to ranges::subrange Date: Tue, 19 Oct 2021 14:29:15 -0400 Message-Id: <20211019182915.1694049-1-ppalka@redhat.com> X-Mailer: git-send-email 2.33.1.711.g9d530dc002 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.1 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, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Patrick Palka Reply-To: Patrick Palka Cc: libstdc++@gcc.gnu.org Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested on x86_64-pc-linux-gnu, does this look OK for trunk and branches? libstdc++-v3/ChangeLog: * include/bits/ranges_util.h (__detail::__uses_nonqualification_pointer_conversion): Define and use it ... (__convertible_to_nonslicing): ... here, as per LWG 3470. * testsuite/std/ranges/subrange/1.cc: New test. --- libstdc++-v3/include/bits/ranges_util.h | 13 +++++++++---- .../testsuite/std/ranges/subrange/1.cc | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 libstdc++-v3/testsuite/std/ranges/subrange/1.cc diff --git a/libstdc++-v3/include/bits/ranges_util.h b/libstdc++-v3/include/bits/ranges_util.h index 7e7b958d274..765848e327d 100644 --- a/libstdc++-v3/include/bits/ranges_util.h +++ b/libstdc++-v3/include/bits/ranges_util.h @@ -184,11 +184,16 @@ namespace ranges namespace __detail { - template + template + concept __uses_nonqualification_pointer_conversion + = is_pointer_v<_From> && is_pointer_v<_To> + && !convertible_to(*)[], + remove_pointer_t<_To>(*)[]>; + + template concept __convertible_to_non_slicing = convertible_to<_From, _To> - && !(is_pointer_v> && is_pointer_v> - && __different_from>, - remove_pointer_t>>); + && !__uses_nonqualification_pointer_conversion, + decay_t<_To>>; template concept __pair_like diff --git a/libstdc++-v3/testsuite/std/ranges/subrange/1.cc b/libstdc++-v3/testsuite/std/ranges/subrange/1.cc new file mode 100644 index 00000000000..8a53261c78c --- /dev/null +++ b/libstdc++-v3/testsuite/std/ranges/subrange/1.cc @@ -0,0 +1,19 @@ +// { dg-options "-std=gnu++20" } +// { dg-do run { target c++20 } } + +#include + +void +test01() +{ + // LWG 3470 + int a[3] = {1,2,3}; + int* b[3] = {&a[2], &a[0], &a[1]}; + auto c = std::ranges::subrange(b); +} + +int +main() +{ + test01(); +}