From nobody Wed Aug 07 16:52:17 2024 X-Original-To: dev-commits-ports-branches@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 4WfGS12Kp3z5SlwY; Wed, 07 Aug 2024 16:52:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WfGS11psyz44mZ; Wed, 7 Aug 2024 16:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723049537; 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=eFJnngU5gSXVNk3ZC/vZtTGydsevhcuZLXrSD76as1U=; b=usOHEC6ILFpJIiFD5JJgL/sG1RgOVqaoeG5CpAZWTDjJjF+KheI1SdTlbXj7TOZjxgOjaM /kSnFM09wlWGLTk1YM806RuwC/EW6MqZlJZ/KJ3LgALgENdmgPAXq+QPQnYQDb6Vc3B/m2 gc3LZtRQ2/IcHZOESlsdmW01Zib38GkzsS+zVCceUGzIYdQawxUCZhpe3hkIn5aLhAz8w5 2XPRRDNv9okdmXknMTl0HPZuPxQZggSVQrA2IA6hZb1B8FJ6mDRKhgOVbWRSwMImfNNSux qDMfPI71XhZWN2GjP4Chcvs+s6LB75fsT2ye9oykxzieiPy/xaKbddKD+ZQYjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723049537; a=rsa-sha256; cv=none; b=YO3ageZgQoz6+0W10HQCYz/ipcw2rvYoMgrvJp0p3ELbqdX7j1SjF28LKcDgLKt6wSbLVd RmS3k+wEsoOSSBrEO6OGNEzV9uNNbFx+ZKh7ibsWYXyknXv7iWXdolLLSvgJ5bnIJGlAio Ly/SuoH44HT+oxqfQV9cRa674zqfuh1sRu+VUrq5c0KHQJh2VJm/n0olH4yeoxY7yyjBuX BhLVoaMlHuPUGmTMI6MvxafvSWZc6TWDZOcrQiP440nTMuVRTLbi3NFm8omOozQsgNl0+t X2QG0/U9/alxXr+JQdvnCw79YzmJSCGbnU1jJhDZ51k6eL8176aAp2vCQB/3ww== 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=1723049537; 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=eFJnngU5gSXVNk3ZC/vZtTGydsevhcuZLXrSD76as1U=; b=W89T6INdijiU6Y/QwdXHfM2djWKvD1PPrvvK2bEpkO0TeYSsWgqccr8ABXdbzAEaZICvCi Lgp9I6Rjp3vgGRtZRn1rEk5oPgBBZx6a9IDrLhsBIcux/UGrlEEHQx9RTsLom1eUm2gIdt ykoi8NO0F4iwz7Q3nHQoTFcp2sDpKQaTxNXHZi8UHlHW6gE3fhn+axp8qoOxz0giSgS9XW k3VTQd05R0UluN4rEi135v8ygoUmh/s0+LzOI18mSVUIth++/ovt+awfL0gN0y+JGnyvXm 4ygmo0ZP/GbKdjVtykWRvZl2Cf615IJDDbwMF9byBdts0VTQmnE/cutVslzx4g== 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 4WfGS11Pgpzxxk; Wed, 7 Aug 2024 16:52:17 +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 477GqHtA058258; Wed, 7 Aug 2024 16:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477GqHpn058255; Wed, 7 Aug 2024 16:52:17 GMT (envelope-from git) Date: Wed, 7 Aug 2024 16:52:17 GMT Message-Id: <202408071652.477GqHpn058255@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 81c40ab2f6ae - 2024Q3 - java/openjdk8: fix build with clang 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 81c40ab2f6ae458d0bcb01d25385c86b6c52fcb3 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=81c40ab2f6ae458d0bcb01d25385c86b6c52fcb3 commit 81c40ab2f6ae458d0bcb01d25385c86b6c52fcb3 Author: Dimitry Andric AuthorDate: 2024-08-01 10:34:13 +0000 Commit: Dimitry Andric CommitDate: 2024-08-07 16:51:45 +0000 java/openjdk8: fix build with clang 19 Clang 19 is now more strict about undefined integral expressions used as constants in enum, which results in errors compiling java/openjdk8, similar to: /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/share/vm/oops/cpCache.hpp:195:34: error: expression is not an integral constant expression 195 | option_bits_mask = ~(((-1) << tos_state_shift) | (field_index_mask | parameter_size_mask)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/share/vm/oops/cpCache.hpp:195:42: note: left shift of negative value -1 195 | option_bits_mask = ~(((-1) << tos_state_shift) | (field_index_mask | parameter_size_mask)) | ^ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/share/vm/code/dependencies.hpp:173:27: error: expression is not an integral constant expression 173 | all_types = ((1 << TYPE_LIMIT) - 1) & ((-1) << FIRST_TYPE), | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/share/vm/code/dependencies.hpp:173:59: note: left shift of negative value -1 173 | all_types = ((1 << TYPE_LIMIT) - 1) & ((-1) << FIRST_TYPE), | ^ In file included from /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp:43: /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h:226:33: error: expression is not an integral constant expression 226 | AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use. | ^~~~~~~~ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h:226:37: note: left shift of negative value -1 226 | AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use. | ^ In openjdk11 and later, the (-1) constants have been replaced by the unsigned variant (~0u), which fixes these errors. PR: 280559 Approved by: glewis (maintainer) MFH: 2024Q3 (cherry picked from commit 55925767376bb8d4ffe1a0304555988464c25599) --- .../files/patch-hotspot_src_share_vm_code_dependencies.hpp | 11 +++++++++++ .../files/patch-hotspot_src_share_vm_oops_cpCache.hpp | 11 +++++++++++ ...dk_src_share_native_com_sun_java_util_jar_pack_constants.h | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_code_dependencies.hpp b/java/openjdk8/files/patch-hotspot_src_share_vm_code_dependencies.hpp new file mode 100644 index 000000000000..8b0a6e6f8342 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_share_vm_code_dependencies.hpp @@ -0,0 +1,11 @@ +--- hotspot/src/share/vm/code/dependencies.hpp.orig 2024-07-27 18:28:39 UTC ++++ hotspot/src/share/vm/code/dependencies.hpp +@@ -170,7 +170,7 @@ class Dependencies: public ResourceObj { + LG2_TYPE_LIMIT = 4, // assert(TYPE_LIMIT <= (1<