1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Frontend/VerifyDiagnosticsClient.cpp b/lib/Frontend/VerifyDiagnosticsClient.cpp
index fce7973d56..16c945b417 100644
--- a/lib/Frontend/VerifyDiagnosticsClient.cpp
+++ b/lib/Frontend/VerifyDiagnosticsClient.cpp
@@ -493,8 +493,10 @@ void VerifyDiagnosticsClient::CheckDiagnostics() {
     if (!FirstErrorFID.isInvalid() && FirstErrorFID != SM.getMainFileID()
         && (!SM.getFileEntryForID(FirstErrorFID)
             || (SM.getFileEntryForID(FirstErrorFID) !=
-                SM.getFileEntryForID(SM.getMainFileID()))))
+                SM.getFileEntryForID(SM.getMainFileID())))) {
       FindExpectedDiags(*CurrentPreprocessor, ED, FirstErrorFID);
+      FirstErrorFID = FileID();
+    }
 
     // Check that the expected diagnostics occurred.
     NumErrors += CheckResults(Diags, SM, *Buffer, ED);