From nobody Fri Nov 01 17:50:28 2024 X-Original-To: dev-commits-ports-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 4Xg7gS4RZkz5cBVf; Fri, 01 Nov 2024 17:50:28 +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 4Xg7gS3mQqz4DWb; Fri, 1 Nov 2024 17:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730483428; 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=HQm2t26qFEolGkLpaO+V0O3D4+YEvZvFLsYrt6ud6p4=; b=IR0B4Dl4/aMKgDfk1c8HbOS4UXKpfQGE0HaMiEPLa6YRfqWSk0Z4nVBCcptpcMjxhaJSC0 dvlh1Kng6KHXMKmxqEz3Q3bPLBmIVz2GW5OH8OyAA36KvCO197sxnYgCa1MFmhyG2YBWJw NhKnscomtGtIuej5mC2hToJS/cm/J9FeZ0/RTuDe3V2a4lMtZTfWxk9tEZ2eCqRlTBpwlN pEqke8Uaffeib5rcMb+2KqoqiUCpXdHyWmcUPQ1fUaZbo45iUVYoFeMpO9jflxK1duBQhS 4PaNY35KKi9kt9R8S7poBeMv6kXJjIy77bHbU28e+vaslZn9yIn97apuzcwouA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730483428; 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=HQm2t26qFEolGkLpaO+V0O3D4+YEvZvFLsYrt6ud6p4=; b=tyPgpt1lrrKCeZQQD0IdjSNVuG9E+lKn1e/RATEiXA3Dd4xrGS7SmrqjvGihctO55app5t HGsTjj5dpinKVa/6NBHXElLB35saD3OF/fI+e9ku9XLVqsqMKYsNZQ5tOlbX7hTiIQ9Qr8 PO3Xf3numyZyhTbfcx+fnPa9tMqdcOHR9h1IMGoDBVL9u7B88w+LXOAZPuIfr7vTQWIY+A gzdv39++EAtdrMiucRnPL9+0xsCPlycYNR8sAz1NaOsOAn5/SJYSmckyXT+I+Nur1VXbqB ZIymTdN6hyu78P0iaQVMeeiHcyl7S4fxE4wNjj449R7yTuBdyKc7pbbKm3AKzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730483428; a=rsa-sha256; cv=none; b=ct7a25bPmEifr1IWJa+uANI2gtJnvvkJOhnyfuXzDEzJEJlicx0huR84F42lATDEvYD5i4 XW821KizcpDnsMUk2wwDrOZthpfkP/QmgdzGdg8jrcbnfU9TvY9PLfUmVvxMkZJMTqzUOM q9HBe2q0g4lYOUUXIBX91C1D9qmCkOX5wDZctqXDXXsrJ2IUPzlVNGwprYd9U5jE7PN1pt bPVSk8jZqXCrWshsUyiYHUNEDctb2W4Y1WYIF/qRzKXXEgHRhiz/N8RytEnMmgr2JZY0pC jL2TeaYxJLsa3/pkfOocgRVvXkTnSvpvwO0WeKJTZcSxITgsTF7ek3IcFp1W6g== 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 4Xg7gS3FMwzWDk; Fri, 1 Nov 2024 17:50:28 +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 4A1HoS9x063938; Fri, 1 Nov 2024 17:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A1HoSoG063935; Fri, 1 Nov 2024 17:50:28 GMT (envelope-from git) Date: Fri, 1 Nov 2024 17:50:28 GMT Message-Id: <202411011750.4A1HoSoG063935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: aa9dd586527b - main - java/openjfx14: fix build with clang 19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: aa9dd586527b3e2a402b9699c5a7934728a27bfe Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa9dd586527b3e2a402b9699c5a7934728a27bfe commit aa9dd586527b3e2a402b9699c5a7934728a27bfe Author: Dimitry Andric AuthorDate: 2024-11-01 13:32:58 +0000 Commit: Dimitry Andric CommitDate: 2024-11-01 17:50:12 +0000 java/openjfx14: fix build with clang 19 Clang 19 now implements CWG 96 [1], which requires a template argument list after a 'template' keyword, resulting in errors similar to: /wrkdirs/usr/ports/java/openjfx14/work/jfx-14.0.2.1-1/modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h:923:65: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 923 | AssemblerType::repatchCompact(dataLabelCompact.template dataLocation(), value); | ^ /wrkdirs/usr/ports/java/openjfx14/work/jfx-14.0.2.1-1/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/JSCast.h:146:33: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 146 | return Dispatcher::template inherits(vm, from); | ^ /wrkdirs/usr/ports/java/openjfx14/work/jfx-14.0.2.1-1/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/JSCast.h:155:37: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 155 | if (LIKELY(Dispatcher::template inherits(vm, from))) | ^ /wrkdirs/usr/ports/java/openjfx14/work/jfx-14.0.2.1-1/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LLIntData.h:159:75: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 159 | return reinterpret_cast(getCodePtr(opcodeID).template executableAddress()); | ^ In all these cases, appending "<>" is enough to satisfy the constraint. [1] https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#96 PR: 282473 MFH: 2024Q4 --- ...JavaScriptCore_assembler_AbstractMacroAssembler.h | 11 +++++++++++ ...in_native_Source_JavaScriptCore_llint_LLIntData.h | 11 +++++++++++ ...ain_native_Source_JavaScriptCore_runtime_JSCast.h | 20 ++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_JavaScriptCore_assembler_AbstractMacroAssembler.h b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_JavaScriptCore_assembler_AbstractMacroAssembler.h new file mode 100644 index 000000000000..35531d5d1c29 --- /dev/null +++ b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_JavaScriptCore_assembler_AbstractMacroAssembler.h @@ -0,0 +1,11 @@ +--- modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h +@@ -920,7 +920,7 @@ class AbstractMacroAssembler : public AbstractMacroAss + template + static void repatchCompact(CodeLocationDataLabelCompact dataLabelCompact, int32_t value) + { +- AssemblerType::repatchCompact(dataLabelCompact.template dataLocation(), value); ++ AssemblerType::repatchCompact(dataLabelCompact.template dataLocation<>(), value); + } + + template diff --git a/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_JavaScriptCore_llint_LLIntData.h b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_JavaScriptCore_llint_LLIntData.h new file mode 100644 index 000000000000..abe9b2a15115 --- /dev/null +++ b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_JavaScriptCore_llint_LLIntData.h @@ -0,0 +1,11 @@ +--- modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LLIntData.h.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LLIntData.h +@@ -156,7 +156,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionPtr(OpcodeID op + #if COMPILER(MSVC) + return reinterpret_cast(getCodePtr(opcodeID).executableAddress()); + #else +- return reinterpret_cast(getCodePtr(opcodeID).template executableAddress()); ++ return reinterpret_cast(getCodePtr(opcodeID).template executableAddress<>()); + #endif + } + diff --git a/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_JavaScriptCore_runtime_JSCast.h b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_JavaScriptCore_runtime_JSCast.h new file mode 100644 index 000000000000..72024f106975 --- /dev/null +++ b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_JavaScriptCore_runtime_JSCast.h @@ -0,0 +1,20 @@ +--- modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/JSCast.h.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/JSCast.h +@@ -143,7 +143,7 @@ bool inherits(VM& vm, From* from) + bool inherits(VM& vm, From* from) + { + using Dispatcher = InheritsTraits; +- return Dispatcher::template inherits(vm, from); ++ return Dispatcher::template inherits<>(vm, from); + } + + } // namespace JSCastingHelpers +@@ -152,7 +152,7 @@ To jsDynamicCast(VM& vm, From* from) + To jsDynamicCast(VM& vm, From* from) + { + using Dispatcher = JSCastingHelpers::InheritsTraits::type>::type>; +- if (LIKELY(Dispatcher::template inherits(vm, from))) ++ if (LIKELY(Dispatcher::template inherits<>(vm, from))) + return static_cast(from); + return nullptr; + }