git: 70236f02f05a - main - Revert "jemalloc: Reduce diffs to 5.2.1 revert to using JEMALLOC_FALLTHROUGH"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 15 Dec 2024 16:24:43 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=70236f02f05a95164a99270639b3eaad8c12fd06 commit 70236f02f05a95164a99270639b3eaad8c12fd06 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2024-12-15 16:23:59 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-12-15 16:23:59 +0000 Revert "jemalloc: Reduce diffs to 5.2.1 revert to using JEMALLOC_FALLTHROUGH" This reverts commit 7bcf5319c1106b761bcb2a4facfeccf1b9db758d. Turns out this is needed for gcc, at least through gcc 14. This wasn't documented it the import when it came in, so revert with this note. 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 0270034e876d..935ddcfc95a1 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; - JEMALLOC_FALLTHROUGH + break; } }