build: compile against LLVM 17 as well as 16

backend/remill/include/remill/Arch/Arch.h

@@ -25,7 +25,7 @@
 #pragma clang diagnostic ignored "-Wswitch-enum"
 
 #include <llvm/ADT/SmallVector.h>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/IRBuilder.h>
 #include <remill/BC/InstructionLifter.h>

backend/remill/include/remill/BC/TraceLifter.h

@@ -25,6 +25,7 @@
 #include <llvm/IR/BasicBlock.h>
 #include <llvm/IR/Constant.h>
 #include <queue>
+#include <set>
 #include <tuple>
 #include <unordered_map>
 

backend/remill/lib/Arch/AArch64/Arch.cpp

@@ -21,7 +21,7 @@
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <iomanip>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/Function.h>

backend/remill/lib/Arch/Arch.cpp

@@ -29,6 +29,14 @@
 #include <iostream>
 #include <llvm/ADT/APInt.h>
 #include <llvm/ADT/SmallVector.h>
+#include <llvm/Config/llvm-config.h>
+// `llvm::AttributeMask` moved into its own header in LLVM 17; before that it arrived with
+// <llvm/IR/Attributes.h> and this file does not exist. Version-guarded rather than added
+// unconditionally, because the native build still runs on LLVM 16 and an unguarded include
+// breaks it with `fatal error: 'llvm/IR/AttributeMask.h' file not found`.
+#if LLVM_VERSION_MAJOR >= 17
+#  include <llvm/IR/AttributeMask.h>
+#endif
 #include <llvm/IR/BasicBlock.h>
 #include <llvm/IR/Function.h>
 #include <llvm/IR/IRBuilder.h>

backend/remill/lib/Arch/Name.cpp

@@ -16,7 +16,7 @@
 
 #include "remill/Arch/Name.h"
 
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 
 namespace remill {
 

backend/remill/lib/Arch/Sleigh/AArch32Arch.cpp

@@ -25,7 +25,7 @@
 
 #include <glog/logging.h>
 #include <iomanip>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/Function.h>

backend/remill/lib/Arch/Sleigh/ARMBase.cpp

@@ -1,5 +1,5 @@
 #include <glog/logging.h>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/Function.h>

backend/remill/lib/Arch/Sleigh/X86Arch.cpp

@@ -17,7 +17,7 @@
 #include "Arch.h"
 
 #include <glog/logging.h>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/Function.h>

backend/remill/lib/Arch/X86/Arch.cpp

@@ -24,7 +24,7 @@
 
 #include <glog/logging.h>
 #include <iomanip>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/Function.h>

backend/remill/lib/BC/Optimizer.cpp

@@ -21,7 +21,7 @@
 #include "remill/BC/Version.h"
 
 #include <glog/logging.h>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/Analysis/TargetLibraryInfo.h>
 #include <llvm/IR/Constants.h>
 #include <llvm/IR/DataLayout.h>

backend/remill/lib/OS/OS.cpp

@@ -18,7 +18,7 @@
 
 #include <gflags/gflags.h>
 #include <glog/logging.h>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 
 namespace remill {
 

lifter/Lift.cpp

@@ -30,7 +30,6 @@
 #include "TraceManager.h"
 
 #include <llvm/IR/LegacyPassManager.h>
-#include <llvm/Transforms/IPO/PassManagerBuilder.h>
 #include <remill/BC/HelperMacro.h>
 #include <remill/BC/InstructionLifter.h>
 #include <remill/BC/Lifter.h>