Support LLVM 16+

google · Apr 28, 2023 · f259306 · f259306
1 parent e87123a
commit f259306
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/build_defs/llvm_project_local.BUILD b/build_defs/llvm_project_local.BUILD
@@ -169,7 +169,10 @@ cc_library(
             "lib/LLVMRemarks.lib",
             "lib/LLVMBitstreamReader.lib",
             "lib/LLVMBinaryFormat.lib",
-        ],
+        ] + glob([
+            # For LLVM 16+, use glob because this file might not exist.
+            "lib/libLLVMTargetParser.lib",
+        ]),
         ":linux_dynamic": [
             ":libllvm-so",
         ],
@@ -178,7 +181,10 @@ cc_library(
             "lib/libLLVMRemarks.a",
             "lib/libLLVMBitstreamReader.a",
             "lib/libLLVMBinaryFormat.a",
-        ],
+        ] + glob([
+            # For LLVM 16+, use glob because this file might not exist.
+            "lib/libLLVMTargetParser.a",
+        ]),
     }),
     hdrs = [":llvm-headers"],
     includes = ["include"],

diff --git a/lldb-eval/context.cc b/lldb-eval/context.cc
@@ -33,11 +33,16 @@
 #include "lldb/API/SBTypeEnumMember.h"
 #include "lldb/API/SBValue.h"
 #include "lldb/API/SBValueList.h"
-#include "llvm/ADT/Triple.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/FormatAdapters.h"
 #include "llvm/Support/FormatVariadic.h"
 
+#if LLVM_VERSION_MAJOR < 16
+#include "llvm/ADT/Triple.h"
+#else
+#include "llvm/TargetParser/Triple.h"
+#endif
+
 namespace {
 
 lldb::SBValue CreateSBValue(lldb::SBTarget target, const void* bytes,

diff --git a/lldb-eval/parser.cc b/lldb-eval/parser.cc
@@ -2358,9 +2358,9 @@ ExprResult Parser::ParseIntegerLiteral(clang::NumericLiteralParser& literal,
 
   auto [type, is_unsigned] = PickIntegerType(*ctx_, literal, raw_value);
 
-  return std::make_unique<LiteralNode>(
-      token.getLocation(), ctx_->GetBasicType(type), raw_value,
-      /*is_literal_zero*/ raw_value.isNullValue());
+  return std::make_unique<LiteralNode>(token.getLocation(), 
+                                       ctx_->GetBasicType(type), raw_value,
+                                       /*is_literal_zero*/ raw_value.isZero());
 }
 
 // Parse a builtin_func.