Roll Clang 243039:245402

tools/clang/plugins/FindBadConstructsConsumer.h

Index: tools/clang/plugins/FindBadConstructsConsumer.h
diff --git a/tools/clang/plugins/FindBadConstructsConsumer.h b/tools/clang/plugins/FindBadConstructsConsumer.h
index 7ad02153ad6aaa55fe3c1d6793ffa2f9dcdd1d88..8f8fc87046630911ac93ae59995da6d5c8ca8a68 100644
--- a/tools/clang/plugins/FindBadConstructsConsumer.h
+++ b/tools/clang/plugins/FindBadConstructsConsumer.h
@@ -85,14 +85,8 @@ class FindBadConstructsConsumer
   static RefcountIssue CheckRecordForRefcountIssue(
       const clang::CXXRecordDecl* record,
       clang::SourceLocation& loc);
-#if defined(LLVM_FORCE_HEAD_REVISION)
   bool IsRefCounted(const clang::CXXBaseSpecifier* base,
                     clang::CXXBasePath& path);
-#else
-  static bool IsRefCountedCallback(const clang::CXXBaseSpecifier* base,
-                                   clang::CXXBasePath& path,
-                                   void* user_data);
-#endif
   static bool HasPublicDtorCallback(const clang::CXXBaseSpecifier* base,
                                     clang::CXXBasePath& path,
                                     void* user_data);