Merge pull request #1497 from clasp-developers/llvm17

Add LLVM 17 support
clasp-developers · Sep 24, 2023 · 7a85494 · 7a85494
2 parents 0926b32 + 0a1e51c
commit 7a85494
Show file tree

Hide file tree

Showing 26 changed files with 233 additions and 1,395 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -41,7 +41,7 @@ jobs:
       run: |
         brew update
         brew upgrade
-        brew install boost fmt gmp llvm@15 ninja pkg-config sbcl ecl netcdf expat
+        brew install boost fmt gmp llvm@17 ninja pkg-config sbcl ecl netcdf expat
     - name: Checkout repository
       uses: actions/checkout@v4
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-# Version 2.4.0 (LLVM15/LLVM16) Pending
+# Version 2.4.0 (LLVM15-17) Pending
 
 ## Added
 * Bytecode stores source location info for debugging.
@@ -7,12 +7,13 @@
 * Circle detection for load forms in bytecode FASL.
 * Bytecode functions can be compiled directly into native code with `cl:compile` (experimental).
 * Support for Linux AARCH64.
+* LLVM17 support. LLVM15 and LLVM16 are still supported.
 
 ## Fixed
 * Avoid segmentation faults from incorrectly calling MP:PROCESS-JOIN in
   EXT:RUN-PROGRAM.
 
-# Version 2.3.0 (LLVM15/LLVM16) 2023-06-04
+# Version 2.3.0 (LLVM15-16) 2023-06-04
 
 ## Added
 * Bytecode compiled images via build mode `:bytecode`.

diff --git a/include/clasp/core/claspconfig.h b/include/clasp/core/claspconfig.h
@@ -36,4 +36,6 @@ THE SOFTWARE.
 #define CLASP_FORMAT_SIZE_T PY_FORMAT_SIZE_T
 #define CLASP_UNICODE_TYPE PY_UNICODE_TYPE
 
+#include <llvm/Config/llvm-config.h>
+
 #endif
diff --git a/include/clasp/llvmo/debugInfoExpose.h b/include/clasp/llvmo/debugInfoExpose.h
@@ -834,7 +834,7 @@ namespace translate {
 
 
 
-#if __clang_major__ < 16
+#if LLVM_VERSION_MAJOR < 16
 namespace translate {
 template <>
 struct from_object<llvm::Optional<llvm::DIFile::ChecksumInfo<llvm::StringRef>>, std::true_type> {
@@ -916,7 +916,7 @@ struct from_object<std::optional<llvm::DIFile::ChecksumInfo<llvm::StringRef>>, s
 };
 #endif
 
-#if __clang_major__ < 16
+#if LLVM_VERSION_MAJOR < 16
 namespace translate {
 template <>
 struct from_object<llvm::Optional<llvm::StringRef>, std::true_type> {

diff --git a/include/clasp/llvmo/jit.h b/include/clasp/llvmo/jit.h
@@ -57,8 +57,12 @@ THE SOFTWARE.
 #include <llvm/Analysis/Passes.h>
 #include <llvm/IR/MDBuilder.h>
 #include <llvm/IR/LegacyPassManager.h>
-#include <llvm/Transforms/IPO/PassManagerBuilder.h>
+#include <llvm/Passes/PassBuilder.h>
+#if LLVM_VERSION_MAJOR < 17
 #include <llvm/ADT/Triple.h>
+#else
+#include <llvm/TargetParser/Triple.h>
+#endif
 #include <llvm/Support/TargetSelect.h>
 #include <llvm/Analysis/TargetLibraryInfo.h>
 #include <llvm/Transforms/Scalar.h>