From nobody Sun Dec 15 16:24:43 2024 X-Original-To: dev-commits-src-main@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 4YB7hD0jR4z5h21l; Sun, 15 Dec 2024 16:24:44 +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 4YB7hD0DXnz49h2; Sun, 15 Dec 2024 16:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734279884; 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=PHsAyIo4jQ31sFhx9S8CG3RCxEhIVYHgfKjO2EMEGL0=; b=W4zi6w9fbnNl5vECelY+dSzRjJ5GubVP8dXciO36M15IR1z3lIdQkeDSdZfPxosR55XZPY jFxU9hHSghTFyd3axAg8x3q7vbk/RRlOVulaRQM+hSCl6kVwJKV40apJc3YAHL9yqHRZVt eLGo5fJO9Coa4IKJItjMbjNiEiG1+CRUNtnrYlOZozon/1cOJJAvTluL1+TBUermzufLbm IyLle9Y2iRZaooIgp4MdYp8+tb6WEVWWQHRtrJLQM2QoXVJcijalYK5FExr1mRXaqyTMxm xvsrpAkFkcJAv7hBW6rM0Pa79eQ4phixyK1rPRkZOfHJoeJpjW3vwrrPm8fYxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734279884; 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=PHsAyIo4jQ31sFhx9S8CG3RCxEhIVYHgfKjO2EMEGL0=; b=S7AZRrLSOmBPkdJ77A2T7yZaFx9DwGAg5Fw6S7tz5jXdt8n6QFYJ1r4khA/UardLYDX+WQ c84sNGniX2FcPO7Lv+w4nSGt85oUCAZwIJyWLwRmaFmswCK/w5sUeLAZsHKrOQ3Oq/C9ej SZZYyd6eOKOWCHLw9EwQHuR3uI+ZTxr4Xf/uxSZjNhCSHc4/7Sk3ct0HihcvuGT/SkcJIO Bg/Y7x5eMDsmPL77uK1hO8e0WAGq/1y9g6j9ytO1jTizsq8azxZaLj57CkmarxSMTwfXGR 4zUO8XhI49IjRUe/4ySCpLs3oWAKBE2CUvup3+RDGRKtn+jblDaQieyzyj3NPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734279884; a=rsa-sha256; cv=none; b=f1wOZFlCvc0o7hiK+DhlTy0bb1OqwsqJF91fCqx0Z6HO7K9jFkMtWLDv8seEDUfmYtZWT1 HarS+DtbrSkO5oIqZ+VdmC4c4Ql4u5YUzUGe91gHnpQM/95MuyRBoHpNXhHT40DUqQowX+ PNaEkA8y885rVu82WXZ+BaH5zovq8Lv3I9+lgMRNBC9RLh9tlb0OpuLL1OGigT17PTSi5W ql4Q9VV40gPnFM285KYb8r96ZgGG5mHpwMYYNPpzyxSv6TFJRT8Am/g0HNfZQfLKGbh8Dm UALiSBXQiXRn1rco7JtlgPsBIdX3jLt1zB5Uue0tZn9VWCiu9ZTQBgzeAl90fA== 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 4YB7hC6xGPzG4S; Sun, 15 Dec 2024 16:24:43 +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 4BFGOhLQ052871; Sun, 15 Dec 2024 16:24:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFGOh6o052868; Sun, 15 Dec 2024 16:24:43 GMT (envelope-from git) Date: Sun, 15 Dec 2024 16:24:43 GMT Message-Id: <202412151624.4BFGOh6o052868@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: 70236f02f05a - main - Revert "jemalloc: Reduce diffs to 5.2.1 revert to using JEMALLOC_FALLTHROUGH" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 70236f02f05a95164a99270639b3eaad8c12fd06 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=70236f02f05a95164a99270639b3eaad8c12fd06 commit 70236f02f05a95164a99270639b3eaad8c12fd06 Author: Warner Losh AuthorDate: 2024-12-15 16:23:59 +0000 Commit: Warner Losh 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; } }