From nobody Fri Dec 13 23:04:29 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 4Y94fP2jGmz5gHNY; Fri, 13 Dec 2024 23:04:29 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y94fP1t7Jz4mVr; Fri, 13 Dec 2024 23:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131069; 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=C4plu5399ps+dm4wsrd10LGgVoL9iNNuljVohvp/q6g=; b=UjCqsJA9ejIHbAtM/gOQaYa315GLlCjddJ4Q0ULc2M3sdS9FSbPN5J+XBMqr9m77fQ+5iP 2ifzPP18IfB8t/N1Q7P6bBHKqnxxRtoAgBKoUKbtQXW5RUvWRj9CLDMV2eZCxfxT/7EAde NEOfC0j6XKrSL7DoLNPN1HgDXHoUFJvqTpTI5thWSwQDAbSDHPJurR8Z2EKchaWHYAOoqz slGXJkCtrVBIIftA7PkzGzGEKO0cRCThqRmuiPuD3zcT4Ppo1J05Cy+pppbWSJTtcrfjID tuk3QyaKYgx6BCLOqL+hi6EnZ9owIfsdF1zGRn2om9TdKVCrt30XBIr3Vtdepw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734131069; 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=C4plu5399ps+dm4wsrd10LGgVoL9iNNuljVohvp/q6g=; b=fZ5rAyv+Lqw4Mi2eN4AwHQ22vIsXqgZFqnm7f5I5/EdfDv0lthOxn5NEAARvZuD28/HmYy R1j6mznMoZMu4Y/bQUVLd7mUpNgP848gPwKyNzxhaqIeEjBU+8z4ViTdcoJdVmzBjPg+aV XdpbYTOrKEZvU0HSevkCakTuldwEeDSmuz4VBDUSb2w6a5dAo4tGsP5qE18rvByjyDD1U/ wpYwQgqkxm3xG5ER1G/P4MFLWS9/X/wdY2yAoFD3+gytm6PHKvq6Gw9gpbEdwnt15gdkZE 1bc58XxP0f20GjVV1DleHz+FhMh4Cl4YrPWgKsnNq3w92MG4ITc2tzZ3k1P8sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734131069; a=rsa-sha256; cv=none; b=oynZ1qOlmscHPnj67tnonaGCuMYBYGyUXeWq1XJ1sZKSBTM5FvN6YRxhim5zjYhHAGi0eA 30WnMVK+gY1Oz5cZIn5DgZbv4zixEOO1J3kZiMaxlc+O/hmFCLBElSir8fgFCvdcl57BeA gBD/NMOJy45P94GBa3WdEvlx0y+mZKrY1Oe3KOQcezengCMDinGS62jGCDze3cspWi3PBl tboChXLvLEuXu3+QBRx1BvOx5F1+Irnhsz3zrQwmEJIFhli0VdzDJ6Y8A+j0dU1NQDL0wg ecokQoIS0BJlpMbE8zSl9Xk3wOoNWuPt1ASltVW/c3rcgIP2jwmrZRTYNl/wRA== 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 4Y94fP0xHLzxdS; Fri, 13 Dec 2024 23:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BDN4Tjk029221; Fri, 13 Dec 2024 23:04:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDN4Txv029218; Fri, 13 Dec 2024 23:04:29 GMT (envelope-from git) Date: Fri, 13 Dec 2024 23:04:29 GMT Message-Id: <202412132304.4BDN4Txv029218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7bcf5319c110 - main - jemalloc: Reduce diffs to 5.2.1 revert to using JEMALLOC_FALLTHROUGH 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bcf5319c1106b761bcb2a4facfeccf1b9db758d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7bcf5319c1106b761bcb2a4facfeccf1b9db758d commit 7bcf5319c1106b761bcb2a4facfeccf1b9db758d Author: Warner Losh AuthorDate: 2024-12-13 22:23:39 +0000 Commit: Warner Losh CommitDate: 2024-12-13 23:04:40 +0000 jemalloc: Reduce diffs to 5.2.1 revert to using JEMALLOC_FALLTHROUGH In the import of 5.2.1 (c5ad81420c495), JEMALLOC_FALLTHROUGH was changed to break (judging by the tagged upstream sources). This changes it back to upstream. No functional change: this is just a textual change (though the fallthrough macro doesn't expand to break). Sponsored by: Netflix --- contrib/jemalloc/include/jemalloc/internal/hash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/jemalloc/include/jemalloc/internal/hash.h b/contrib/jemalloc/include/jemalloc/internal/hash.h index 935ddcfc95a1..0270034e876d 100644 --- a/contrib/jemalloc/include/jemalloc/internal/hash.h +++ b/contrib/jemalloc/include/jemalloc/internal/hash.h @@ -199,7 +199,7 @@ hash_x86_128(const void *key, const int len, uint32_t seed, case 2: k1 ^= tail[ 1] << 8; JEMALLOC_FALLTHROUGH case 1: k1 ^= tail[ 0] << 0; k1 *= c1; k1 = hash_rotl_32(k1, 15); k1 *= c2; h1 ^= k1; - break; + JEMALLOC_FALLTHROUGH } }