diff --git a/clang/Driver/ASTConsumers.cpp b/clang/Driver/ASTConsumers.cpp
index 77cc99640a80..05debe38d492 100644
--- a/clang/Driver/ASTConsumers.cpp
+++ b/clang/Driver/ASTConsumers.cpp
@@ -670,7 +670,7 @@ void CheckerConsumer::VisitCFG(CFG& C, Decl& CD) {
   if (!Loc.isFileID())
     return;
   
-  if (!AnalyzeAll && Loc.getFileID() != Ctx->getSourceManager().getMainFileID())
+  if (!AnalyzeAll && !Ctx->getSourceManager().isFromMainFile(Loc))
     return;
   
   // Lazily create the diagnostic client.