Revert "Revert "Revert "Revert "[analyzer] NFC: Move path diagnostic consumer implementations to libAnalysis.""""

This reverts commit b12f26733a4259c90e5f387aceb9f23c35e003b8.

Fix dead include that looked like another missed circular dependency.

1 files changed, 12 insertions, 1 deletions

diff --git a/clang/lib/CrossTU/CrossTranslationUnit.cpp b/clang/lib/CrossTU/CrossTranslationUnit.cpp
index e27779f..5ab5d6d 100644
--- a/clang/lib/CrossTU/CrossTranslationUnit.cpp
+++ b/clang/lib/CrossTU/CrossTranslationUnit.cpp
@@ -765,7 +765,7 @@ CrossTranslationUnitContext::getOrCreateASTImporter(ASTUnit *Unit) {
 
 llvm::Optional<std::pair<SourceLocation, ASTUnit *>>
 CrossTranslationUnitContext::getImportedFromSourceLocation(
-    const clang::SourceLocation &ToLoc) const {
+    SourceLocation ToLoc) const {
   const SourceManager &SM = Context.getSourceManager();
   auto DecToLoc = SM.getDecomposedLoc(ToLoc);
 
@@ -781,5 +781,16 @@ CrossTranslationUnitContext::getImportedFromSourceLocation(
   return std::make_pair(FromLoc, Unit);
 }
 
+llvm::Optional<std::pair<SourceLocation, Preprocessor *>>
+CrossTranslationUnitContext::getImportedFromSourceLocationWithPreprocessor(
+    SourceLocation ToLoc) const {
+  if (llvm::Optional<std::pair<SourceLocation, ASTUnit *>> LocAndUnit =
+      getImportedFromSourceLocation(ToLoc)) {
+    return std::make_pair(LocAndUnit->first,
+                          &LocAndUnit->second->getPreprocessor());
+  }
+  return None;
+}
+
 } // namespace cross_tu
 } // namespace clang