Merge remote-tracking branch 'hjudt/llvm-17.0.0' into llvm-17.0.0

rpav · Mar 13, 2024 · a64c79b · a64c79b
2 parents 097cbe6 + 0e5b709
commit a64c79b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ project(c2ffi)
 set(SOURCE_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
 
 # Apparently the LLVM package doesn't support ranges
-find_package(LLVM 16.0.0 CONFIG)
+find_package(LLVM 17.0.0 CONFIG)
 find_package(Clang REQUIRED CONFIG)
 
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")

diff --git a/src/AST.cpp b/src/AST.cpp
@@ -39,7 +39,7 @@
 #include <clang/Parse/Parser.h>
 #include <llvm/ADT/ArrayRef.h>
 #include <llvm/ADT/IntrusiveRefCntPtr.h>
-#include <llvm/Support/Host.h>
+#include <llvm/TargetParser/Host.h>
 #include <llvm/Support/raw_ostream.h>
 #include <llvm/Support/ConvertUTF.h>
 
@@ -242,7 +242,7 @@ Decl* C2FFIASTConsumer::make_decl(const clang::VarDecl* d, bool is_toplevel)
     if(d->hasInit()) {
         if(!d->getType()->isDependentType()) {
             clang::EvaluatedStmt* stmt = d->ensureEvaluatedStmt();
-            clang::Expr*          e    = clang::cast<clang::Expr>(stmt->Value);
+            clang::Expr*          e    = clang::cast<clang::Expr*>(stmt->Value);
             if(!e->isValueDependent() && ((v = d->evaluateValue()) || (v = d->getEvaluatedValue()))) {
                 if(v->isLValue()) {
                     clang::APValue::LValueBase base = v->getLValueBase();

diff --git a/src/c2ffi.cpp b/src/c2ffi.cpp
@@ -21,7 +21,7 @@
 #include <iostream>
 
 #include <llvm/Support/raw_os_ostream.h>
-#include <llvm/Support/Host.h>
+#include <llvm/TargetParser/Host.h>
 #include <llvm/ADT/IntrusiveRefCntPtr.h>
 
 #include <clang/Basic/Version.h>

diff --git a/src/init.cpp b/src/init.cpp
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <memory>
 
-#include <llvm/Support/Host.h>
+#include <llvm/TargetParser/Host.h>
 #include <llvm/ADT/IntrusiveRefCntPtr.h>
 #include <llvm/Option/Option.h>
 

diff --git a/src/options.cpp b/src/options.cpp
@@ -24,7 +24,7 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
-#include <llvm/Support/Host.h>
+#include <llvm/TargetParser/Host.h>
 
 #include "c2ffi.h"
 #include "c2ffi/opt.h"