From nobody Fri Aug 16 15:44:48 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 4WlmX02gSWz5T7mP; Fri, 16 Aug 2024 15:44:48 +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 4WlmX01CwRz4fD2; Fri, 16 Aug 2024 15:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723823088; 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=Pcm953tyq28mhffZLk/vhCO212ikh5uxURz3D45h0yE=; b=eGTE6JCexAADYWNsJnt15JyeUI8E2YYB4/JhRC9KUw8XX6oTQu79xAIcKVW8Smw/yAY3oP utmcPCXRcvPTHhoofrk9ZlVp7aEWHxJAUwBsWBuWkWOy0ydMQ0t4bC2saG1D0d1znzmNK3 ZVUGGQdgyBBGYW/0UNZ7dE90NCEKo4VFamuPJQj9l1Ghss3e8Q2F5q+7vuAVPH9sGPfbd6 DG+KiND/dBq1FpM1E0d/T+hSJGrmw14HmExs5EIH/ZyXqEY4/Syw/fOOAuulWiMfFvruKA 4ckZkfEy+f90PQs/rfQVHohqfBT+xX0PGhr4IgA+tdlg+oX10a8nSyRWdH7Xcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723823088; a=rsa-sha256; cv=none; b=OAIOHDd0Bk3eVr4jYokqe0wMge4b9svBmaf5ReK7k8/jpRyaBXgk5xHUnV3DMH8KiJk88l 0ICheDmL+xsLuHRUL27aSblxaoyrt66FvpS1ywId4DHbeDrH0m/cJ5X609tl3bVj7K71zp tI8EGfXE1F0DAEwmo5Cf37VMUoRexqzAwG+oFf3QJ7kioq/yp0r4wm46fgPbFatuoBl0mW HWUvC7jfMbD2tk6fVDX/AOPG69WAkp6qqmnUHnswx7zbH+14OkBYS4WUQ4UbE5fm8iMIVm ICmyoVBUZkAomddynACIbKpg3kSTegD6iWgGuh7zcuRwDCD5iCSTg/ZDuTZSBg== 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=1723823088; 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=Pcm953tyq28mhffZLk/vhCO212ikh5uxURz3D45h0yE=; b=TNwOZxEvtYIEBlZOkpsSev1JOHuOVcZ+DGtwTGeYspyD9Gs+C0UgkB7cmsimt4hdnfVVVe odnakg4LhXhJEvA9RrG4MLGSni9UeHUC2Br8T0hc39LWRpFtfsqB3DbBugPZ9P9nbgaNPy Kb/mnkf7DbEGVxD3AXD9T2pChJyoraxpT/vsZLTFYYCPD10/1fGXR7PyZqbH/ndtoXOj4S A+6hIuLTQQbz79v35lCRdM9wF55ejO+41LklweBPlJxJrfO/rAvVj0Djcr+X12Sgrqeqlj XXvEb/YD+SMk3oQW/i+/OOkg67BFS+/ptIwa1juEG1zw9YcgYoghbuGU3+xDUg== 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 4WlmX00qqKz1C5P; Fri, 16 Aug 2024 15:44:48 +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 47GFimRC095963; Fri, 16 Aug 2024 15:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GFimud095960; Fri, 16 Aug 2024 15:44:48 GMT (envelope-from git) Date: Fri, 16 Aug 2024 15:44:48 GMT Message-Id: <202408161544.47GFimud095960@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: 1efe047448b0 - 2024Q3 - devel/llvm14: 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: 1efe047448b0922f2057dd2fc382f9b498f8a098 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=1efe047448b0922f2057dd2fc382f9b498f8a098 commit 1efe047448b0922f2057dd2fc382f9b498f8a098 Author: Dimitry Andric AuthorDate: 2024-08-12 13:43:49 +0000 Commit: Dimitry Andric CommitDate: 2024-08-16 15:44:13 +0000 devel/llvm14: 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/devel/llvm14/work/llvm-project-14.0.6.src/flang/include/flang/Evaluate/integer.h:310:32: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 310 | auto back{FROM::template ConvertSigned(result.value)}; | ^ /wrkdirs/usr/ports/devel/llvm14/work/llvm-project-14.0.6.src/flang/lib/Evaluate/fold-real.cpp:72:22: warning: variable 'z' set but not used [-Wunused-but-set-variable] 72 | } else if (auto *z{UnwrapExpr>(args[0])}) { | ^ /wrkdirs/usr/ports/devel/llvm14/work/llvm-project-14.0.6.src/flang/lib/Evaluate/fold-real.cpp:69:15: warning: variable 'x' set but not used [-Wunused-but-set-variable] 69 | if (auto *x{UnwrapExpr>(args[0])}) { | ^ /wrkdirs/usr/ports/devel/llvm14/work/llvm-project-14.0.6.src/flang/lib/Evaluate/fold-real.cpp:148:60: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 148 | SCALE(y)}; | ^ /wrkdirs/usr/ports/devel/llvm14/work/llvm-project-14.0.6.src/flang/runtime/reduction-templates.h:89:24: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 89 | accumulator.template GetResult(&result); | ^ /wrkdirs/usr/ports/devel/llvm14/work/llvm-project-14.0.6.src/flang/runtime/reduction-templates.h:130:24: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 130 | accumulator.template GetResult(result, zeroBasedDim); | ^ /wrkdirs/usr/ports/devel/llvm14/work/llvm-project-14.0.6.src/flang/runtime/reduction-templates.h:158:24: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 158 | accumulator.template GetResult(result, zeroBasedDim); | ^ /wrkdirs/usr/ports/devel/llvm14/work/grpc-1.62.2/src/core/lib/promise/detail/basic_seq.h:103:38: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 103 | Traits::template CallSeqFactory(f_, *cur_, std::move(arg))); | ^ Upstream has committed a fix to their main branch [2], but it does not apply cleanly to 14.0.6, so add a backported patch. [1] https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#96 [2] https://github.com/llvm/llvm-project/commit/7bc7672925f8154be3b8220365d3f269ac43621c PR: 280776 Approved by: brooks (maintainer) MFH: 2024Q3 (cherry picked from commit 51c043a810db5af08a918fd7bfc31086ead88265) --- devel/llvm14/files/patch-backport-7bc7672925 | 72 ++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/devel/llvm14/files/patch-backport-7bc7672925 b/devel/llvm14/files/patch-backport-7bc7672925 new file mode 100644 index 000000000000..e0c65d86e71f --- /dev/null +++ b/devel/llvm14/files/patch-backport-7bc7672925 @@ -0,0 +1,72 @@ +From 7bc7672925f8154be3b8220365d3f269ac43621c Mon Sep 17 00:00:00 2001 +From: David Spickett +Date: Mon, 3 Jun 2024 15:21:26 +0100 +Subject: [PATCH] [flang] Fix compilation errors due to new clang template + requirements (#94204) + +Since https://github.com/llvm/llvm-project/pull/80801 clang requires a +template argument list after the use of the template keyword. + +https://lab.llvm.org/buildbot/#/builders/176/builds/10230 + +error: a template argument list is expected after a name prefixed by the +template keyword [-Wmissing-template-arg-list-after-template-kw] + +This fixes the instances found by the AArch64 Linux builds. +--- + flang/include/flang/Evaluate/integer.h | 2 +- + flang/lib/Evaluate/fold-real.cpp | 7 ++++--- + flang/runtime/reduction-templates.h | 8 ++++---- + 3 files changed, 9 insertions(+), 8 deletions(-) + +--- flang/include/flang/Evaluate/integer.h.orig 2022-06-22 16:46:24 UTC ++++ flang/include/flang/Evaluate/integer.h +@@ -307,7 +307,7 @@ class Integer { (public) + } + result.overflow = false; + } else if constexpr (bits < FROM::bits) { +- auto back{FROM::template ConvertSigned(result.value)}; ++ auto back{FROM::template ConvertSigned(result.value)}; + result.overflow = back.value.CompareUnsigned(that) != Ordering::Equal; + } + return result; +--- flang/lib/Evaluate/fold-real.cpp.orig 2022-06-22 16:46:24 UTC ++++ flang/lib/Evaluate/fold-real.cpp +@@ -145,7 +145,7 @@ Expr> FoldIntrinsicFunc + #ifndef _MSC_VER + template + #endif +- SCALE(y)}; ++ SCALE>(y)}; + if (result.flags.test(RealFlag::Overflow)) { + context.messages().Say( + "SCALE intrinsic folding overflow"_en_US); +--- flang/runtime/reduction-templates.h.orig 2022-06-22 16:46:24 UTC ++++ flang/runtime/reduction-templates.h +@@ -86,7 +86,7 @@ inline CppTypeFor GetTotalReduction(const D + #ifdef _MSC_VER // work around MSVC spurious error + accumulator.GetResult(&result); + #else +- accumulator.template GetResult(&result); ++ accumulator.template GetResult(&result); + #endif + return result; + } +@@ -127,7 +127,7 @@ inline void ReduceDimToScalar(const Descriptor &x, int + #ifdef _MSC_VER // work around MSVC spurious error + accumulator.GetResult(result, zeroBasedDim); + #else +- accumulator.template GetResult(result, zeroBasedDim); ++ accumulator.template GetResult(result, zeroBasedDim); + #endif + } + +@@ -155,7 +155,7 @@ inline void ReduceDimMaskToScalar(const Descriptor &x, + #ifdef _MSC_VER // work around MSVC spurious error + accumulator.GetResult(result, zeroBasedDim); + #else +- accumulator.template GetResult(result, zeroBasedDim); ++ accumulator.template GetResult(result, zeroBasedDim); + #endif + } +