From nobody Fri Jun 07 18:45:47 2024 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 4Vwqs83P8Gz5M3FP; Fri, 07 Jun 2024 18:45:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vwqs81K0Cz3x5R; Fri, 7 Jun 2024 18:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717785948; 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=bDbznpOEf+PHR+gQRfn1y7ZzXiHi0eosM79ho2fsYnE=; b=oZfsMbYdWDZysZmfmm1VKQlLDpQZ6PP9CQS8SO9KdL6hcaiiUg6zt95V9dO0vLwYXNlbzk 44tchclQSAPoaFKT4j7tnlfaZkyStXSs2VrKC9AHrWOYu+TyQaEtQINcJ80PybnU4xn+kC f/WwGFu8IukZTF4T/Y2X9mVnkuec18dVpDOuLXU+4rgKS28820Lr2laq+Mk5kp9vz5E3K/ kowPxx13V7od1ouNEF8KaINq1kWfSJQR0e3/xFmAkH3lqrwtTjdfap8EE/yg2itQWaiNxP Vi5xSzifPCPj4Xrr2DkK8qWVuABrYQP541aJIo8lwMRyAHPlGQlTjFovVBvJAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717785948; a=rsa-sha256; cv=none; b=hEeb+hoc7Ykxanc6/m/1SoNgS/lcaC7Wv1gsTeW3ViAA0N5bwGRtUgnSy063M0Xt8dTjb4 UO8Bzjv6pNxShusfb+IUrIxaXRj3995LhzhwSo3ee++ppXxArv9BTknPab9zVO1HErr35G EEAJPo+WVFxCYuQMqXqGL3hMuZz4vdRCR66P+nIQm4z+4DRONoPfr52N2NsOcOhV7zxLPR eSbTP/TROeznNiF3A88EtdaLYeP4WPLn87bVuGZVeoiT/kY8gtTaUErdwCSLsHixsWyQdG EbOkSRdIonjglLrNg5IN9l86QLjIO9Xd8gSIuGiXbz73GG0wYwhbbKbdQ+872A== 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=1717785948; 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=bDbznpOEf+PHR+gQRfn1y7ZzXiHi0eosM79ho2fsYnE=; b=lEmYd8fztG03b2/qfcw/eG6tBmTxP8zpC47+W+taepZoYkJ3kCto0HQ6d+t6Ga8KKmtc3z Q5nnRUvrWr3lMaXeFWjZZhVwqHD2vcaU696LN5kgjm2BzSEwvz2NODdKiczezWGQy3Jcg1 64W6Qq/BDHyv60HRZKr74hq3MSq3fgGyDyXJjMlelnLJDtG29Ffl+PDa+7ofEViANj2mSW Q0WbCjIE9G7r+hIQQ+gRsuzVJtxtipIyjd1x8CKtD0odOQeYmpypvdxsLLuB2m8eVyi17e 9CKXDspLxnafpRCx2aS7MVfaZXfDVn/shaGGKIjzT0ljMzCYsd/bjbB3eIKuQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vwqs80pLQzQhP; Fri, 7 Jun 2024 18:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 457Ijl0q077605; Fri, 7 Jun 2024 18:45:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 457IjlYq077602; Fri, 7 Jun 2024 18:45:47 GMT (envelope-from git) Date: Fri, 7 Jun 2024 18:45:47 GMT Message-Id: <202406071845.457IjlYq077602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: ead8e4c081e5 - main - Merge commit 382f70a877f0 from llvm-project (by Louis Dionne): 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: ead8e4c081e5c4de4d508fc353f381457b058ca6 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ead8e4c081e5c4de4d508fc353f381457b058ca6 commit ead8e4c081e5c4de4d508fc353f381457b058ca6 Author: Dimitry Andric AuthorDate: 2024-06-07 18:42:53 +0000 Commit: Dimitry Andric CommitDate: 2024-06-07 18:43:46 +0000 Merge commit 382f70a877f0 from llvm-project (by Louis Dionne): [libc++][NFC] Rewrite function call on two lines for clarity (#79141) Previously, there was a ternary conditional with a less-than comparison appearing inside a template argument, which was really confusing because of the <...> of the function template. This patch rewrites the same statement on two lines for clarity. Merge commit d129ea8d2fa3 from llvm-project (by Vitaly Buka): [libcxx] Align `__recommend() + 1` by __endian_factor (#90292) This is detected by asan after #83774 Allocation size will be divided by `__endian_factor` before storing. If it's not aligned, we will not be able to recover allocation size to pass into `__alloc_traits::deallocate`. we have code like this ``` auto __allocation = std::__allocate_at_least(__alloc(), __recommend(__sz) + 1); __p = __allocation.ptr; __set_long_cap(__allocation.count); void __set_long_cap(size_type __s) _NOEXCEPT { __r_.first().__l.__cap_ = __s / __endian_factor; __r_.first().__l.__is_long_ = true; } size_type __get_long_cap() const _NOEXCEPT { return __r_.first().__l.__cap_ * __endian_factor; } inline ~basic_string() { __annotate_delete(); if (__is_long()) __alloc_traits::deallocate(__alloc(), __get_long_pointer(), __get_long_cap()); } ``` 1. __recommend() -> even size 2. `std::__allocate_at_least(__alloc(), __recommend(__sz) + 1)` - > not even size 3. ` __set_long_cap() `- > lose one bit of size for __endian_factor == 2 (see `/ __endian_factor`) 4. `__alloc_traits::deallocate(__alloc(), __get_long_pointer(), __get_long_cap())` -> uses even size (see `__get_long_cap`) This should fix incorrect deallocation sizes for some instances of std::string. Memory profiling or debugging tools like AddressSanitizer, LeakSanitizer or TCMalloc could then complain about the the size passed to a deallocation not matching the size originally passed to the allocation. Reported by: Aliaksei Kandratsenka PR: 279560 MFC after: 3 days --- contrib/llvm-project/libcxx/include/string | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/string b/contrib/llvm-project/libcxx/include/string index ba169c3dbfc9..56e2ef09947f 100644 --- a/contrib/llvm-project/libcxx/include/string +++ b/contrib/llvm-project/libcxx/include/string @@ -1943,10 +1943,10 @@ private: if (__s < __min_cap) { return static_cast(__min_cap) - 1; } - size_type __guess = - __align_it < sizeof(value_type) < __alignment ? __alignment / sizeof(value_type) : 1 > (__s + 1) - 1; + const size_type __boundary = sizeof(value_type) < __alignment ? __alignment / sizeof(value_type) : __endian_factor; + size_type __guess = __align_it<__boundary>(__s + 1) - 1; if (__guess == __min_cap) - ++__guess; + __guess += __endian_factor; return __guess; }