From nobody Sat Apr 25 14:20:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRg1hCyz6bZVL for ; Sat, 25 Apr 2026 14:20:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2sRf5wjVz3HyX for ; Sat, 25 Apr 2026 14:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126814; 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=DTS8PEfyJHHo6VFZitBrMCfKNI6NuZQE6qsw4zS5wL8=; b=ER4lFbY79lGlyTb2mbXgkE/KYfhq2Iyw4pH0UXd3q7qDHiHlTHcYWh0dXOGk7QYyU9eEEg +6+sHJZUBndBF7Mu9bl9PJ9pdAYksPcay+LUt8q2Yrmxmko5YJOCFPEboppckxAFk1OnGc XhKHMKk3sP/dHU9d4Gxk6e+CiqyRK+JsVR2uCu3eqZZRTGT7YbgN3oJfeCA8BBV4J1aAcC sUf9L6pd2IgG974pcGkTn7hyCQupv/war1MzYc0fysiUurs6a45Gk40rJZPvkUmazZwY8z EV5ncqh6aWjjWOXCFOCsI3/HLIwr/Y7gowvyi17INIfw7dxt2Z1R9/jVVbHsVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126814; a=rsa-sha256; cv=none; b=QXb6z2uSqKSru8mDLgHWHQN9hru84nR/onb2TT72HGpAqYP47sea+f5cPcjKLmo1UGKk73 0phHjdmoces6fFiolpvfzBT7EMktgDDywZk6sTjy8f8Sv4eSrna/oCp/ld0Nfwb9QKqexM N99d+78KsWIvliw6n1Ux03iRY4NDoDBCDhInMbAGIqBfQ3pSdiKDQkGqzG6Ccyj9VM6p0t PVYcngBN8XVEAybYMIlRS9sKkMSPnqczSh7J+CUf15yiC94D9Mc4N+rxmVyGCOjs6YSxt6 hTr8EvG7JPcuIzuTHAIo7q1hzqJKKOD2HqZx0/qajVYd4RJRRpdM+uqhMTYFHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126814; 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=DTS8PEfyJHHo6VFZitBrMCfKNI6NuZQE6qsw4zS5wL8=; b=IIMIsnrUwLsPJJKW2ASxIhUB6rJwxrapKcB9f3RkjyGnySLjOxCekg9CSgzkjkzdzShv8m RYSw3NDwNcJKhN0F3iiCnAqAffFNKkaRa5KxU+CJpL3GtYUYMhLOxFvQdbux0XIhtkBpMM RvfoxgII05upANCCN0LMu7VQU7CeI+GrypEZefbMhsV6cMp+dlvUQ50GKL3IGOyHeNmsdn YO/pLKXHXvu3gQ0PPj4RkJ9SoYvZQLYA2oXr25PnvjyXPh78dD9gGGzziMBHjzxxhkY4SW 9Zg3aV9dEh80+cDZBbr7wiZJwvyZ+yyqZpgJ1PYfNOqWgOxfnJsOUGqGKS02LA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRf5D9Yzd0r for ; Sat, 25 Apr 2026 14:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38a86 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:20:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Dimitry Andric From: Dimitry Andric Subject: git: 17f1a5e638f8 - main - libcxx-compat: fix llvmorg-21-init-12415-g3a86e0bd29f3: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17f1a5e638f845e171ab4e3db2a07bf8c6ac3388 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:20:14 +0000 Message-Id: <69eccd9e.38a86.1f918c70@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=17f1a5e638f845e171ab4e3db2a07bf8c6ac3388 commit 17f1a5e638f845e171ab4e3db2a07bf8c6ac3388 Author: Dimitry Andric AuthorDate: 2026-01-05 21:07:58 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:14:21 +0000 libcxx-compat: fix llvmorg-21-init-12415-g3a86e0bd29f3: [libc++] Optimize std::getline (#121346) ``` ----------------------------------------------- Benchmark old new ----------------------------------------------- BM_getline_string 318 ns 32.4 ns ``` Move the __bump_stream() lamda in to a separate function, so this will compile with clang 18 and lower, in C++03 mode and earlier. PR: 292067 MFC after: 1 month --- contrib/llvm-project/libcxx/include/istream | 28 ++++++++++++++------------- contrib/llvm-project/libcxx/include/streambuf | 4 ++++ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/istream b/contrib/llvm-project/libcxx/include/istream index 93def61a8b47..61abf3f1c254 100644 --- a/contrib/llvm-project/libcxx/include/istream +++ b/contrib/llvm-project/libcxx/include/istream @@ -1259,6 +1259,18 @@ operator>>(basic_istream<_CharT, _Traits>& __is, basic_string<_CharT, _Traits, _ return __is; } +template +inline _LIBCPP_HIDE_FROM_ABI_AFTER_V1 void __bump_stream( + const _CharT* __first, _CharT& __1buf, std::basic_streambuf<_CharT, _Traits>& __buffer, ptrdiff_t __diff) { + if (__first == std::addressof(__1buf)) { + _LIBCPP_ASSERT_INTERNAL(__diff == 0 || __diff == 1, "trying to bump stream further than buffer size"); + if (__diff != 0) + __buffer.sbumpc(); + } else { + __buffer.__gbump_ptrdiff(__diff); + } +} + template _LIBCPP_HIDE_FROM_ABI basic_istream<_CharT, _Traits>& getline(basic_istream<_CharT, _Traits>& __is, basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm) { @@ -1285,31 +1297,21 @@ getline(basic_istream<_CharT, _Traits>& __is, basic_string<_CharT, _Traits, _All __last = std::addressof(__1buf) + 1; } - auto __bump_stream = [&](ptrdiff_t __diff) { - if (__first == std::addressof(__1buf)) { - _LIBCPP_ASSERT_INTERNAL(__diff == 0 || __diff == 1, "trying to bump stream further than buffer size"); - if (__diff != 0) - __buffer.sbumpc(); - } else { - __buffer.__gbump_ptrdiff(__diff); - } - }; - const auto* const __match = _Traits::find(__first, __last - __first, __dlm); if (__match) __last = __match; if (auto __cap = __str.max_size() - __str.size(); __cap > static_cast(__last - __first)) { __str.append(__first, __last); - __bump_stream(__last - __first); + __bump_stream(__first, __1buf, __buffer, __last - __first); if (__match) { - __bump_stream(1); // Remove the matched character + __bump_stream(__first, __1buf, __buffer, 1); // Remove the matched character break; } } else { __str.append(__first, __cap); - __bump_stream(__cap); + __bump_stream(__first, __1buf, __buffer, __cap); __state |= ios_base::failbit; break; } diff --git a/contrib/llvm-project/libcxx/include/streambuf b/contrib/llvm-project/libcxx/include/streambuf index 585ae7af65aa..bc34ac19131d 100644 --- a/contrib/llvm-project/libcxx/include/streambuf +++ b/contrib/llvm-project/libcxx/include/streambuf @@ -379,6 +379,10 @@ private: char_type* __nout_ = nullptr; char_type* __eout_ = nullptr; + template + _LIBCPP_HIDE_FROM_ABI_AFTER_V1 friend void __bump_stream( + const _CharT2* __first, _CharT2& __1buf, std::basic_streambuf<_CharT2, _Traits2>& __buffer, ptrdiff_t __diff); + template _LIBCPP_HIDE_FROM_ABI friend basic_istream<_CharT2, _Traits2>& getline(basic_istream<_CharT2, _Traits2>&, basic_string<_CharT2, _Traits2, _Allocator>&, _CharT2);