clif_copybara_to_forked.sh exact (no manual changes)

google · Jan 20, 2024 · a7906d5 · a7906d5
1 parent e1806d0
commit a7906d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/clif/backend/BUILD b/clif/backend/BUILD
@@ -62,7 +62,6 @@ cc_library(
         "//clif/protos:ast_cc_proto",
         "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/log",
-        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_prod",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:sema",
@@ -74,6 +73,7 @@ cc_library(
     name = "strutil",
     hdrs = ["strutil.h"],
     deps = [
+        "@com_google_absl//absl/strings",
         "@llvm-project//llvm:Support",
     ],
 )

diff --git a/clif/backend/matcher.cc b/clif/backend/matcher.cc
@@ -2736,10 +2736,10 @@ const FunctionDecl* ClifMatcher::MatchAndSetFuncFromCandidates(
 
     if (auto method_decl = llvm::dyn_cast<clang::CXXMethodDecl>(clang_decl)) {
       func_decl->set_cpp_const_method(method_decl->isConst());
-#if PYCLIF_LLVM_VERSION_MAJOR < 18  // The version number is a guess.
-      func_decl->set_is_pure_virtual(method_decl->isPure());
-#else
+#if PYCLIF_LLVM_VERSION_MAJOR >= 18  // llvm/llvm-project#78463
       func_decl->set_is_pure_virtual(method_decl->isPureVirtual());
+#else
+      func_decl->set_is_pure_virtual(method_decl->isPure());
 #endif
     }