From nobody Fri May 29 23:04:38 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 4gRzT2750wz6gFtN for ; Fri, 29 May 2026 23:04:38 +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 4gRzT242lJz3HPr for ; Fri, 29 May 2026 23:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095878; 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=TpH0ksvZlbk0OUbJqWPL4cjuSRZwgGqQah5Bcz+byVA=; b=LWiE+dCc8k0RxBFOkd956ccLLfAehsqRptctO4wV3+7mfG19in76QAKWrk7FDyNnvIpT3I z9oSi8V6HSCX4I3v5RzXro/HZEjvDcaOkf7EyP+KCQ+fR0pATzl3T+E6rKT4GLAp0S8Y17 7F1F2NUtCtG1sD1+XiWwBWEbdPFjaHgv4wDOPu766RwUoJRXq2ZYncLlHYqMohOAGXmePj TdsHWT55TxcSDBQ9kMFwjmbDy9pkORARy1Ys3PQnUT3NRP1NDevMzAmPh2k+eKsIsZnoOQ eCdXYfezznNu+gtTMDbb8A0KMDNrB7Q66ZHA7VGErs7uE4N/0lx4R5+sWFhjcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095878; a=rsa-sha256; cv=none; b=PiwaEuxy9DMxAugPHvl9xr4wKNB/HGk9jGrrJvkZiPQMyZnF2z/GWm1P8IKbrDrQ2CfhnD RBH+ir5RrahE7I+CQVFaFfPzOsh26wEhVaLslpPckOU1+8Y08Ps3c5YsZaf/i1NWxeuWzR JoBicd2yRT30MO/CL53t0E3GTbPMQV+7GFXHcegqIkpfkEdtNdo1Ul3XviG/zif9oQACmg 0SKikdnkCk/n8J6WCbpzhG2ZQ7fAxM6qpLNPoeMUEoe/rO7DvraH41D+spZagKOQ46ZMBu zbGJ4SY9pLCX7e+k2axvhvQYkB7DmpOwiT+QKJ5ioxTBiaxI/PR8Hw4+v8Ur7w== 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=1780095878; 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=TpH0ksvZlbk0OUbJqWPL4cjuSRZwgGqQah5Bcz+byVA=; b=JFJZJgjpdQnzxKg+WsHETqD8uOt3JShbRX9Y53IEXhR8GXsPijdcNFQmVoCSJ3VN3W2z4y NUXBj2PI/+MvQQiWI+0r+hCNj+MVn7QAYPxrVmrKuI91x7fuK1paIvqoVT6FCrcCiSLmAc 8i/qLk4yUwnEPKJOfmUd/g04JVLdMOEeYWorPC+x5yEW2R+k0XiWOAKsCABpnJftorYUxB umT8sW869aAsYh0ROKDaOZgTjJmM5cJSoBwav8Dvc6f4y6bTs35NwQIdqW+ZmkWGArNigg qR7XsBIZCTFSKMzij3DkkdWkGHW0ln3OnvmJpvsB9n8IRYs3AWNBaMfH+t1etg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzT23V3ZztjJ for ; Fri, 29 May 2026 23:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4036e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:04:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dimitry Andric From: Dimitry Andric Subject: git: ba4a80fecbee - stable/14 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/14 X-Git-Reftype: branch X-Git-Commit: ba4a80fecbee8a11a072fcfe4647bb260745b634 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:04:38 +0000 Message-Id: <6a1a1b86.4036e.536fd598@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ba4a80fecbee8a11a072fcfe4647bb260745b634 commit ba4a80fecbee8a11a072fcfe4647bb260745b634 Author: Dimitry Andric AuthorDate: 2026-01-05 21:07:58 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:59:36 +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 (cherry picked from commit 17f1a5e638f845e171ab4e3db2a07bf8c6ac3388) --- 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);