git: ffb3af751e7f - main - devel/cvise: Fix build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 28 Jun 2026 00:49:37 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ffb3af751e7f19b63c620a300a02b18743dcf3ef
commit ffb3af751e7f19b63c620a300a02b18743dcf3ef
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2026-06-27 19:47:14 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2026-06-28 00:30:55 +0000
devel/cvise: Fix build
---
devel/cvise/files/patch-llvm21 | 95 +++++++++++++++++++-----------------------
1 file changed, 43 insertions(+), 52 deletions(-)
diff --git a/devel/cvise/files/patch-llvm21 b/devel/cvise/files/patch-llvm21
index 97cb833e48b6..750ff4d1da11 100644
--- a/devel/cvise/files/patch-llvm21
+++ b/devel/cvise/files/patch-llvm21
@@ -12,9 +12,7 @@ Date: 2025-06-24T22:14:34+02:00
This fixes #171.
-diff --git .github/workflows/build-llvm-nightly.yml .github/workflows/build-llvm-nightly.yml
-index 3912cdc7..7dca21fa 100644
---- .github/workflows/build-llvm-nightly.yml
+--- .github/workflows/build-llvm-nightly.yml.orig 2025-09-23 20:51:29 UTC
+++ .github/workflows/build-llvm-nightly.yml
@@ -27,10 +27,10 @@ jobs:
- run: nproc
@@ -30,14 +28,12 @@ index 3912cdc7..7dca21fa 100644
- uses: actions/checkout@v4
- run: mkdir objdir
- run: cmake ..
-diff --git clang_delta/CommonRenameClassRewriteVisitor.h clang_delta/CommonRenameClassRewriteVisitor.h
-index b758df79..598493b1 100644
---- clang_delta/CommonRenameClassRewriteVisitor.h
+--- clang_delta/CommonRenameClassRewriteVisitor.h.orig 2025-09-23 20:51:29 UTC
+++ clang_delta/CommonRenameClassRewriteVisitor.h
-@@ -368,7 +368,12 @@ template<typename T> bool CommonRenameClassRewriteVisitor<T>::
+@@ -368,7 +368,12 @@ template<typename T> bool CommonRenameClassRewriteVisi
dyn_cast<DependentTemplateSpecializationType>(Ty);
TransAssert(DTST && "Bad DependentTemplateSpecializationType!");
-
+
- const IdentifierInfo *IdInfo = DTST->getIdentifier();
+ const IdentifierInfo *IdInfo =
+#if LLVM_VERSION_MAJOR > 20
@@ -48,14 +44,12 @@ index b758df79..598493b1 100644
std::string IdName = IdInfo->getName().str();
std::string Name;
if (getNewNameByName(IdName, Name)) {
-diff --git clang_delta/RemoveNamespace.cpp clang_delta/RemoveNamespace.cpp
-index 20d234ee..ba816b07 100644
---- clang_delta/RemoveNamespace.cpp
+--- clang_delta/RemoveNamespace.cpp.orig 2025-09-23 20:51:29 UTC
+++ clang_delta/RemoveNamespace.cpp
-@@ -440,7 +440,12 @@ bool RemoveNamespaceRewriteVisitor::VisitDependentTemplateSpecializationTypeLoc(
+@@ -440,7 +440,12 @@ bool RemoveNamespaceRewriteVisitor::VisitDependentTemp
dyn_cast<DependentTemplateSpecializationType>(Ty);
TransAssert(DTST && "Bad DependentTemplateSpecializationType!");
-
+
- const IdentifierInfo *IdInfo = DTST->getIdentifier();
+ const IdentifierInfo *IdInfo =
+#if LLVM_VERSION_MAJOR > 20
@@ -65,23 +59,21 @@ index 20d234ee..ba816b07 100644
+#endif
std::string IdName = IdInfo->getName().str();
std::string Name;
-
-@@ -563,7 +568,9 @@ bool RemoveNamespaceRewriteVisitor::TraverseNestedNameSpecifierLoc(
- break;
+
+@@ -563,7 +568,9 @@ bool RemoveNamespaceRewriteVisitor::TraverseNestedName
+ break;
}
case NestedNameSpecifier::TypeSpec: // Fall-through
+#if LLVM_VERSION_MAJOR <= 20
case NestedNameSpecifier::TypeSpecWithTemplate:
+#endif
- TraverseTypeLoc(Loc.getTypeLoc());
- break;
+ TraverseTypeLoc(Loc.getTypeLoc());
+ break;
default:
-diff --git clang_delta/RemoveUnusedFunction.cpp clang_delta/RemoveUnusedFunction.cpp
-index ca9d3f7b..9b0c9651 100644
---- clang_delta/RemoveUnusedFunction.cpp
+--- clang_delta/RemoveUnusedFunction.cpp.orig 2025-09-23 20:51:29 UTC
+++ clang_delta/RemoveUnusedFunction.cpp
-@@ -254,7 +254,11 @@ bool RUFAnalysisVisitor::VisitFunctionDecl(FunctionDecl *FD)
-
+@@ -254,7 +254,11 @@ bool RUFAnalysisVisitor::VisitFunctionDecl(FunctionDec
+
if (FD->isReferenced() ||
FD->isMain() ||
+#if LLVM_VERSION_MAJOR > 20
@@ -92,9 +84,7 @@ index ca9d3f7b..9b0c9651 100644
ConsumerInstance->hasReferencedSpecialization(CanonicalFD) ||
ConsumerInstance->isInlinedSystemFunction(CanonicalFD) ||
ConsumerInstance->isInReferencedSet(CanonicalFD) ||
-diff --git clang_delta/RenameFun.cpp clang_delta/RenameFun.cpp
-index 8dee2431..2a4b0ae6 100644
---- clang_delta/RenameFun.cpp
+--- clang_delta/RenameFun.cpp.orig 2025-09-23 20:51:29 UTC
+++ clang_delta/RenameFun.cpp
@@ -261,7 +261,13 @@ void RenameFun::addFun(const FunctionDecl *FD)
{
@@ -109,53 +99,54 @@ index 8dee2431..2a4b0ae6 100644
+#endif
+ )
FunToNameMap[FD] = Name;
-
+
if (FunToNameMap.find(FD) != FunToNameMap.end())
-diff --git clang_delta/Transformation.cpp clang_delta/Transformation.cpp
-index d4896cb9..0da9827a 100644
---- clang_delta/Transformation.cpp
+--- clang_delta/Transformation.cpp.orig 2025-09-23 20:51:29 UTC
+++ clang_delta/Transformation.cpp
-@@ -675,7 +675,10 @@ const DeclContext *Transformation::getDeclContextFromSpecifier(
- return NAD->getNamespace()->getCanonicalDecl();
+@@ -675,7 +675,10 @@ const DeclContext *Transformation::getDeclContextFromS
+ return NAD->getNamespace()->getCanonicalDecl();
}
case NestedNameSpecifier::TypeSpec: // Fall-through
- case NestedNameSpecifier::TypeSpecWithTemplate: {
+#if LLVM_VERSION_MAJOR <= 20
+ case NestedNameSpecifier::TypeSpecWithTemplate:
+#endif
-+ {
- const Type *Ty = NNS->getAsType();
- if (const RecordType *RT = Ty->getAs<RecordType>())
- return RT->getDecl();
-diff --git clang_delta/TransformationManager.cpp clang_delta/TransformationManager.cpp
-index d985bd51..d36f62a5 100644
---- clang_delta/TransformationManager.cpp
++ {
+ const Type *Ty = NNS->getAsType();
+ if (const RecordType *RT = Ty->getAs<RecordType>())
+ return RT->getDecl();
+@@ -1163,4 +1166,3 @@ Transformation::~Transformation(void)
+ {
+ RewriteUtils::Finalize();
+ }
+-
+--- clang_delta/TransformationManager.cpp.orig 2025-09-23 20:51:29 UTC
+++ clang_delta/TransformationManager.cpp
-@@ -163,7 +163,12 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
+@@ -163,7 +163,12 @@ bool TransformationManager::initializeCompilerInstance
ClangInstance->createFileManager();
-
+
if(CLCPath != NULL && ClangInstance->hasFileManager() &&
- ClangInstance->getFileManager().getDirectory(CLCPath, false)) {
+#if LLVM_VERSION_MAJOR > 20
-+ ClangInstance->getFileManager().getDirectoryRef(CLCPath, false)
++ ClangInstance->getFileManager().getDirectoryRef(CLCPath, false)
+#else
-+ ClangInstance->getFileManager().getDirectory(CLCPath, false)
++ ClangInstance->getFileManager().getDirectory(CLCPath, false)
+#endif
+ ) {
- Args.push_back("-I");
- Args.push_back(CLCPath);
+ Args.push_back("-I");
+ Args.push_back(CLCPath);
}
-@@ -186,7 +191,12 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
-
- TargetInfo *Target =
+@@ -186,7 +191,12 @@ bool TransformationManager::initializeCompilerInstance
+
+ TargetInfo *Target =
TargetInfo::CreateTargetInfo(ClangInstance->getDiagnostics(),
- ClangInstance->getInvocation().TargetOpts);
+#if LLVM_VERSION_MAJOR > 20
-+ ClangInstance->getInvocation().getTargetOpts()
++ ClangInstance->getInvocation().getTargetOpts()
+#else
-+ ClangInstance->getInvocation().TargetOpts
++ ClangInstance->getInvocation().TargetOpts
+#endif
-+ );
++ );
ClangInstance->setTarget(Target);
-
+
if (const char *env = getenv("CVISE_INCLUDE_PATH")) {