Merge pull request #420 from bkryza/add-support-for-llvm-21

Add support for llvm 21

Author: bkryza

build.ps1

@@ -1,5 +1,5 @@
 param (
-  $Prefix="C:\clang-uml-llvm19",
+  $Prefix="C:\clang-uml-llvm20",
   $BuildType="Release"
 )
 

cmake/LLVMSetup.cmake

@@ -18,20 +18,21 @@ if(NOT "${LLVM_CONFIG_PATH}" STREQUAL "")
             OUTPUT_VARIABLE LLVM_VERSION_STR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.(.+)"
-            GIT_VERSION_MATCH ${LLVM_VERSION_STR})
+            LLVM_VERSION_MATCH ${LLVM_VERSION_STR})
     set(LLVM_VERSION ${CMAKE_MATCH_1})
+    set(LLVM_VERSION_MINOR ${CMAKE_MATCH_2})
 endif()
 
-if(LLVM_VERSION STREQUAL "18")
-    set(LLVM_VERSION "18.1")
-endif()
-
-if(LLVM_VERSION STREQUAL "19")
-    set(LLVM_VERSION "19.1")
+if("${LLVM_VERSION_MINOR}" STREQUAL "")
+    if("${LLVM_VERSION}" STRGREATER_EQUAL "18")
+        set(LLVM_VERSION_MINOR "1")
+    else()
+        set(LLVM_VERSION_MINOR "0")
+    endif()
 endif()
 
-if(LLVM_VERSION STREQUAL "20")
-    set(LLVM_VERSION "20.1")
+if(NOT "${LLVM_VERSION}" STREQUAL "" AND NOT "${LLVM_VERSION_MINOR}" STREQUAL "")
+    set(LLVM_VERSION "${LLVM_VERSION}.${LLVM_VERSION_MINOR}")
 endif()
 
 find_package(LLVM ${LLVM_VERSION} CONFIG REQUIRED)

docs/installation.md

@@ -216,7 +216,7 @@ Build and install `yaml-cpp`:
 ```bash
 git clone https://github.com/jbeder/yaml-cpp
 cd yaml-cpp
-git checkout yaml-cpp-0.8.0
+git checkout 0.8.0
 cd ..
 cmake -S .\yaml-cpp\ -B .\yaml-cpp-build\ -DYAML_BUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="C:\clang-uml" -Thost=x64
 cd yaml-cpp-build
@@ -228,7 +228,7 @@ Build and install `LLVM`:
 ```bash
 pip install psutil
 # Update the LLVM branch if necessary
-git clone --branch llvmorg-19.1.3 --depth 1 https://github.com/llvm/llvm-project.git llvm
+git clone --branch llvmorg-20.1.7 --depth 1 https://github.com/llvm/llvm-project.git llvm
 cmake -S .\llvm\llvm -B llvm-build -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_INSTALL_PREFIX="C:\clang-uml" -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD=X86 -Thost=x64
 cd llvm-build
 msbuild .\INSTALL.vcxproj -maxcpucount /p:Configuration=Release

packaging/make_installer.ps1

@@ -1,6 +1,6 @@
 # This script assumes that all clang-uml dependencies are instaled in C:\clang-uml
 
-param ($Prefix="C:\clang-uml-llvm19", $BuildType="Release")
+param ($Prefix="C:\clang-uml-llvm20", $BuildType="Release")
 
 mkdir _BUILD
 

src/class_diagram/visitor/translation_unit_visitor.cc

@@ -321,14 +321,26 @@ bool translation_unit_visitor::VisitClassTemplateDecl(
     id_mapper().add(cls->getID(), id);
 
     constexpr auto kMaxConstraintCount = 24U;
+
+#if LLVM_VERSION_MAJOR < 21
     llvm::SmallVector<const clang::Expr *, kMaxConstraintCount> constraints{};
     if (cls->hasAssociatedConstraints()) {
         cls->getAssociatedConstraints(constraints);
     }
-
     for (const auto *expr : constraints) {
         find_relationships_in_constraint_expression(*c_ptr, expr);
     }
+#else
+    llvm::SmallVector<clang::AssociatedConstraint, kMaxConstraintCount>
+        constraints{};
+    if (cls->hasAssociatedConstraints()) {
+        cls->getAssociatedConstraints(constraints);
+    }
+    for (const auto &constraint : constraints) {
+        find_relationships_in_constraint_expression(
+            *c_ptr, constraint.ConstraintExpr);
+    }
+#endif
 
     return add_or_update(cls->getTemplatedDecl(), std::move(c_ptr));
 }
@@ -500,6 +512,8 @@ bool translation_unit_visitor::TraverseConceptDecl(clang::ConceptDecl *cpt)
     tbuilder().build_from_template_declaration(*concept_model, *cpt);
 
     constexpr auto kMaxConstraintCount = 24U;
+
+#if LLVM_VERSION_MAJOR < 21
     llvm::SmallVector<const clang::Expr *, kMaxConstraintCount> constraints{};
     if (cpt->hasAssociatedConstraints()) {
         cpt->getAssociatedConstraints(constraints);
@@ -508,6 +522,17 @@ bool translation_unit_visitor::TraverseConceptDecl(clang::ConceptDecl *cpt)
     for (const auto *expr : constraints) {
         find_relationships_in_constraint_expression(*concept_model, expr);
     }
+#else
+    llvm::SmallVector<clang::AssociatedConstraint, kMaxConstraintCount>
+        constraints{};
+    if (cpt->hasAssociatedConstraints()) {
+        cpt->getAssociatedConstraints(constraints);
+    }
+    for (const auto &constraint : constraints) {
+        find_relationships_in_constraint_expression(
+            *concept_model, constraint.ConstraintExpr);
+    }
+#endif
 
     if (cpt->getConstraintExpr() != nullptr) {
         process_constraint_requirements(

src/common/clang_utils.cc

@@ -189,7 +189,11 @@ std::string to_string(const clang::QualType &type, const clang::ASTContext &ctx,
 
     clang::PrintingPolicy print_policy(ctx.getLangOpts());
     print_policy.SuppressScope = 0;
+#if LLVM_VERSION_MAJOR < 21
     print_policy.PrintCanonicalTypes = 0;
+#else
+    print_policy.PrintAsCanonical = 0;
+#endif
 
     std::string result;
 

src/common/generators/clang_tool.h

@@ -103,7 +103,11 @@ class clang_tool {
     ArgumentsAdjuster args_adjuster_;
 
     std::unique_ptr<diagnostic_consumer> diag_consumer_;
+#if LLVM_VERSION_MAJOR < 21
     llvm::IntrusiveRefCntPtr<clang::DiagnosticOptions> diag_opts_;
+#else
+    std::unique_ptr<clang::DiagnosticOptions> diag_opts_;
+#endif
 };
 } // namespace clanguml::generators
 

src/common/visitor/template_builder.h

@@ -1385,13 +1385,17 @@ template_builder<VisitorT>::try_as_member_pointer(
 
         argument.add_template_param(std::move(pointee_arg));
 
+#if LLVM_VERSION_MAJOR < 21
         const auto *member_class_type = mp_type->getClass();
+#else
+        const auto *member_class_type = mp_type->getQualifier()->getAsType();
+#endif
 
         if (member_class_type == nullptr)
             return {};
 
         auto class_type_arg = process_type_argument(location_decl, parent, cls,
-            template_decl, mp_type->getClass()->getCanonicalTypeUnqualified(),
+            template_decl, member_class_type->getCanonicalTypeUnqualified(),
             template_instantiation, argument_index);
 
         argument.add_template_param(std::move(class_type_arg));
@@ -1413,13 +1417,17 @@ template_builder<VisitorT>::try_as_member_pointer(
         // Add return type argument
         argument.add_template_param(std::move(return_type_arg));
 
+#if LLVM_VERSION_MAJOR < 21
         const auto *member_class_type = mp_type->getClass();
+#else
+        const auto *member_class_type = mp_type->getQualifier()->getAsType();
+#endif
 
         if (member_class_type == nullptr)
             return {};
 
         auto class_type_arg = process_type_argument(location_decl, parent, cls,
-            template_decl, mp_type->getClass()->getCanonicalTypeUnqualified(),
+            template_decl, member_class_type->getCanonicalTypeUnqualified(),
             template_instantiation, argument_index);
 
         // Add class type argument

tests/CMakeLists.txt

@@ -164,20 +164,19 @@ foreach(TEST_NAME ${TEST_NAMES})
             # We need to link the objective test cases sources to a separate
             # ObjC library than the rest of C++ test cases
             add_library(test_cases_objc)
-            if(APPLE)
-                target_compile_options(
-                    test_cases_objc
-                    PRIVATE
-                        "SHELL:-isystem ${LLVM_INCLUDE_DIR}/c++/v1"
-                        "SHELL:-isystem ${LLVM_LIBRARY_DIR}/clang/${LLVM_VERSION_MAJOR}/include"
-                )
-            else(APPLE)
+            target_compile_options(
+                test_cases_objc
+                PRIVATE
+                    "SHELL:-isystem ${LLVM_INCLUDE_DIR}/c++/v1"
+                    "SHELL:-isystem ${LLVM_LIBRARY_DIR}/clang/${LLVM_VERSION_MAJOR}/include"
+            )
+            if(NOT APPLE)
                 target_compile_options(test_cases_objc
                                        PRIVATE ${GNUSTEP_CFLAGS})
                 target_link_libraries(
                     test_cases_objc PRIVATE ${GNUSTEP_LDFLAGS}
                                             ${FETCHED_LIBOBJC2_NAME})
-            endif(APPLE)
+            endif(NOT APPLE)
             target_sources(test_cases_objc PUBLIC ${TEST_CASES_OBJC_SOURCES})
         endif(ENABLE_OBJECTIVE_C_TEST_CASES)
         target_sources(${TEST_NAME} PUBLIC ${TEST_NAME}.cc