From patchwork Mon Sep 15 13:57:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 120288 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 C3EF0384A031 for ; Mon, 15 Sep 2025 14:03:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C3EF0384A031 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=eu/yB+T2 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 ESMTP id C9FBB3857C7B for ; Mon, 15 Sep 2025 13:59:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C9FBB3857C7B Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C9FBB3857C7B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757944741; cv=none; b=SttA6JuBorws4kd24ok8J2Lu4rwPDgS8r9t8Sif0dZzahaKkPE1hzQ3QTs8ZES3ZvrgGBgWr53INcGxPu/eWrha45k0agK9D1h0HU9dmB6mRdjXV34RMV04zpC5KnvAfubkHUcRhTaN4W2Ir/Y/mdwJW8D14k0l1wixEIog8Z64= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757944741; c=relaxed/simple; bh=mZyUL67/O/0/FHjIMzk1AvP7ll2V7X38252XB2Rc564=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=vgxoXg/6/bsnJnT2PqsvxBGSon/0XnqmHgRzYeSqU8VWI37y336f2mthAMM7ZGzJX+R23iEsOb0k5n5ub0TLF0Yoy4RQoFy8b4ty5sD1cseQ47d5uOG1wHWP5aIr7aPm4uJ4Al5RvXp0zZ6/1x3e6AJ3m9lAYZcN2aMN5g4N1fo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C9FBB3857C7B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1757944741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4kUTK9F15li4pN+Rs0zVVwLCYZvNS8MhEhvREevJkA=; b=eu/yB+T2dJjDIrpZTPx/r9pg/w7CusMOdTaiNmeaG6BvVoPR6ljHoL8k55NiYJF97IDa3p dC5teuJorzQdliUj26HzPuWhUDoTEyJtlx3MDj9k8XIFPLKneHU+UTQrOGJuMxiUfxGbyq XZU36PbY0dQyR2NUYuzEVyMokCMvvqc= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-398-dbiJrkR8OROvtqFEyW1H7g-1; Mon, 15 Sep 2025 09:59:00 -0400 X-MC-Unique: dbiJrkR8OROvtqFEyW1H7g-1 X-Mimecast-MFC-AGG-ID: dbiJrkR8OROvtqFEyW1H7g_1757944739 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 22FB81944EBF; Mon, 15 Sep 2025 13:58:59 +0000 (UTC) Received: from zen.kayari.org (unknown [10.42.28.4]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F3AC819560A2; Mon, 15 Sep 2025 13:58:57 +0000 (UTC) From: Jonathan Wakely To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH] libstdc++: Fix more missing uses of iter_difference_t [PR119820] Date: Mon, 15 Sep 2025 14:57:45 +0100 Message-ID: <20250915135855.2450790-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: HNsBju1cETf6LtwORPX9SBu57EDMEre_ta_p3t18z0A_1757944739 X-Mimecast-Originator: redhat.com 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_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org libstdc++-v3/ChangeLog: PR libstdc++/119820 * include/bits/ranges_algo.h (__shuffle_fn): Use ranges::distance to get difference type value to add to iterator. * include/std/format (__formatter_str::_M_format_range): Use ranges::next to increment iterator by a size_t value. --- Testing now on powerpc64le-linux. libstdc++-v3/include/bits/ranges_algo.h | 2 +- libstdc++-v3/include/std/format | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/ranges_algo.h b/libstdc++-v3/include/bits/ranges_algo.h index 6ec233f19df8..ea933be2f604 100644 --- a/libstdc++-v3/include/bits/ranges_algo.h +++ b/libstdc++-v3/include/bits/ranges_algo.h @@ -2028,7 +2028,7 @@ namespace ranges && !sized_sentinel_for, iterator_t<_Range>>) return (*this)(ranges::begin(__r), - ranges::begin(__r) + ranges::size(__r), + ranges::begin(__r) + ranges::distance(__r), std::forward<_Gen>(__g)); else return (*this)(ranges::begin(__r), ranges::end(__r), diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index d6a2170e45d8..842972eed4ca 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -1440,7 +1440,7 @@ namespace __format else if constexpr (ranges::random_access_range<_Rg>) { ranges::iterator_t<_Rg> __first = ranges::begin(__rg); - ranges::subrange __sub(__first, __first + __w); + ranges::subrange __sub(__first, ranges::next(__first, __w)); return _M_format_escaped(_String(from_range, __sub), __fc); } else if (__w <= __n)