The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7bcf5319c1106b761bcb2a4facfeccf1b9db758d
commit 7bcf5319c1106b761bcb2a4facfeccf1b9db758d
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2024-12-13 22:23:39 +0000
Commit: Warner Losh <i...@freebsd.org>
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
}
}
