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.129.124]) by sourceware.org (Postfix) with ESMTPS id 581893858C52 for ; Fri, 9 Sep 2022 17:24:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 581893858C52 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=1662744290; 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; bh=urz4iCWtcS1MvyORO2fnTc+0ZDGthQbhL/ZSGU3w3uk=; b=J+tGvK6q2sJVmWIkoIMwuznOw8wSO1ssxKvVBSy1vBje/PSXCf5LO0MZdL2ztK3gsUu9nV sd+4J0gjIAcLvnl3hd21+O1V5qo5qA3eTBMMa+JcQgVguDFzt3d7+U2P56Jzu1GTp5d9+h QF4ags13AP2WrauvkN4Po6cTM8nWdmo= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-245-LOszI1jXMcWsFg7UGMjz_w-1; Fri, 09 Sep 2022 13:24:49 -0400 X-MC-Unique: LOszI1jXMcWsFg7UGMjz_w-1 Received: by mail-qv1-f71.google.com with SMTP id og5-20020a056214428500b00496b5246db5so1675285qvb.10 for ; Fri, 09 Sep 2022 10:24:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=urz4iCWtcS1MvyORO2fnTc+0ZDGthQbhL/ZSGU3w3uk=; b=Lt4uHv99seOQHauPniLmOF1G1eVwdL558GX4Y9x2lczKsMFerYk6x1hZaAHUMfiG7L QcOHTIZucb4QtXAnu+BUvf6BVJrd+XhPL/SHLGsqG/ulrCWcgMc4jP4/ZH5/tGojE+Su F44tVtdBKXNXnRTKzJiAqhJt3q3Ynipmk8DmFfl7ZPcaoJ+SqJHE8jtyqVhco0egFKN1 CHqKtnpGextrWG7n+5Rhe6Tg8IsK5hOCGb3rwwL71GRgx6KkA54yxwrcTcW5+tuMLJrl sZQY5KubpY/mDVM5UrO36BukpWY3l3tsFxGRopliySxl9TwTGUTJlK8XqQXwpmLMWLxJ MyFg== X-Gm-Message-State: ACgBeo3FbHD4y+HSBtwwjvmmO0mOmVDp5GOfnD6QGVGQX4wG9OHma4MJ hHc22mDey8m8DHXUC8b9WjEdkoA2WMIdA8uyz+pUeYLdlVMTzj67nEgBxWVKukq8YTGKf2YFIkH s3zGBzu43LDiULMQ= X-Received: by 2002:ac8:7fc4:0:b0:344:5b83:de4c with SMTP id b4-20020ac87fc4000000b003445b83de4cmr13361586qtk.671.1662744288984; Fri, 09 Sep 2022 10:24:48 -0700 (PDT) X-Google-Smtp-Source: AA6agR7ZWj26EWCrWmIdwV5sGgzvzK/uK2wlhZFhyAP00PhWF85OzrJaXveAQbIl59fgYh+RsRuk1Q== X-Received: by 2002:ac8:7fc4:0:b0:344:5b83:de4c with SMTP id b4-20020ac87fc4000000b003445b83de4cmr13361566qtk.671.1662744288703; Fri, 09 Sep 2022 10:24:48 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id f5-20020a05622a1a0500b003445bb107basm820250qtb.75.2022.09.09.10.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Sep 2022 10:24:48 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH 1/3] libstdc++: Fix zip_view's operator- for integer-class difference type [PR106766] Date: Fri, 9 Sep 2022 13:24:44 -0400 Message-Id: <20220909172446.1546805-1-ppalka@redhat.com> X-Mailer: git-send-email 2.37.3.518.g79f2338b37 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-14.3 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: make_unsigned_t can't give us the unsigned version of an integer-class difference type, so use __make_unsigned_like_t / __to_unsigned_like instead. PR libstdc++/106766 libstdc++-v3/ChangeLog: * include/std/ranges (zip_view::_Iterator::operator-): Use __to_unsigned_like instead of make_unsigned_t. (zip_view::_Sentinel::operator-): Likewise. * testsuite/std/ranges/zip/1.cc (test04): New test. --- libstdc++-v3/include/std/ranges | 8 ++++---- libstdc++-v3/testsuite/std/ranges/zip/1.cc | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 2b5cb0531f0..2b8fec3c386 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -4657,8 +4657,8 @@ namespace views::__adaptor return ranges::min({difference_type(std::get<_Is>(__x._M_current) - std::get<_Is>(__y._M_current))...}, ranges::less{}, - [](difference_type __i) -> make_unsigned_t { - return __i < 0 ? -__i : __i; + [](difference_type __i) { + return __detail::__to_unsigned_like(__i < 0 ? -__i : __i); }); }(make_index_sequence{}); } @@ -4726,8 +4726,8 @@ namespace views::__adaptor return [&](index_sequence<_Is...>) { return ranges::min({_Ret(std::get<_Is>(__x._M_current) - std::get<_Is>(__y._M_end))...}, ranges::less{}, - [](_Ret __i) -> make_unsigned_t<_Ret> { - return __i < 0 ? -__i : __i; + [](_Ret __i) { + return __detail::__to_unsigned_like(__i < 0 ? -__i : __i); }); }(make_index_sequence{}); } diff --git a/libstdc++-v3/testsuite/std/ranges/zip/1.cc b/libstdc++-v3/testsuite/std/ranges/zip/1.cc index 0113efdb537..f868c97cb69 100644 --- a/libstdc++-v3/testsuite/std/ranges/zip/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/zip/1.cc @@ -102,10 +102,24 @@ test03() return true; } +constexpr bool +test04() +{ + // PR libstdc++/106766 + auto r = views::zip(views::iota(__int128(0), __int128(1))); + auto i = r.begin(); + auto s = r.end(); + VERIFY( s - i == 1 ); + VERIFY( i + 1 - i == 1 ); + + return true; +} + int main() { static_assert(test01()); static_assert(test02()); static_assert(test03()); + static_assert(test04()); } -- 2.37.3.518.g79f2338b37