Support LLVM15

CMakeLists.txt

@@ -3,7 +3,7 @@ project(llvm-dialects)
 
 # Options intended for configuration by the user:
 #  - CMAKE_BUILD_TYPE
-#  - LLVM_DIR
+#  - LLVM_ROOT
 #
 # The build system is intended to be usable both as an external subproject of
 # the llvm-project build tree, and as a separate subdirectory / subproject.

lib/Dialect/OpDescription.cpp

@@ -145,25 +145,37 @@ template <> const OpDescription &OpDescription::get<BinaryOperator>() {
 // ============================================================================
 // Descriptions of intrinsic facades implemented in LLVM
 
+
+#if HAVE_LLVM_VERSION_MAJOR >= 16
 HANDLE_INTRINSIC_DESC_OPCODE_SET(LifetimeIntrinsic, Intrinsic::lifetime_start,
                                  Intrinsic::lifetime_end)
+#endif
 
 // Add Intrinsic::dbg_addr back for sufficiently recent LLVM
 HANDLE_INTRINSIC_DESC_OPCODE_SET(DbgInfoIntrinsic, Intrinsic::dbg_declare,
-                                 Intrinsic::dbg_value, Intrinsic::dbg_label,
-                                 Intrinsic::dbg_assign)
+                                 Intrinsic::dbg_value, Intrinsic::dbg_label
+#if HAVE_LLVM_VERSION_MAJOR >= 16
+                                 ,Intrinsic::dbg_assign
+#endif
+                                 )
 
 // Add Intrinsic::dbg_addr back for sufficiently recent LLVM
 HANDLE_INTRINSIC_DESC_OPCODE_SET(DbgVariableIntrinsic, Intrinsic::dbg_declare,
-                                 Intrinsic::dbg_value, Intrinsic::dbg_assign)
+                                 Intrinsic::dbg_value
+#if HAVE_LLVM_VERSION_MAJOR >= 16
+                                 ,Intrinsic::dbg_assign
+#endif
+                                )
 
 HANDLE_INTRINSIC_DESC(DbgDeclareInst, dbg_declare)
 HANDLE_INTRINSIC_DESC(DbgValueInst, dbg_value)
 
 // Add this back for sufficiently recent LLVM
 // HANDLE_INTRINSIC_DESC(DbgAddrIntrinsic, dbg_addr)
 
+#if HAVE_LLVM_VERSION_MAJOR >= 16
 HANDLE_INTRINSIC_DESC(DbgAssignIntrinsic, dbg_assign)
+#endif
 HANDLE_INTRINSIC_DESC(DbgLabelInst, dbg_label)
 
 HANDLE_INTRINSIC_DESC_OPCODE_SET(AtomicMemIntrinsic,

lib/Dialect/Utils.cpp

@@ -26,7 +26,11 @@ using namespace llvm;
 using namespace llvm_dialects;
 
 bool llvm_dialects::areTypesEqual(ArrayRef<Type *> types) {
+#if HAVE_LLVM_VERSION_MAJOR >= 16
   return llvm::all_equal(types);
+#else
+  return llvm::is_splat(types);
+#endif
 }
 
 // The following function is copied verbatim from