Revert r302037

The commit caused the following two buildbot failures:

    Clang :: Misc/error-limit-multiple-notes.cpp
    Clang :: Misc/error-limit.c


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@302046 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Basic/Diagnostic.cpp

@@ -146,9 +146,8 @@ void DiagnosticsEngine::SetDelayedDiagnostic(unsigned DiagID, StringRef Arg1,
 }
 
 void DiagnosticsEngine::ReportDelayed() {
-  unsigned ID = DelayedDiagID;
+  Report(DelayedDiagID) << DelayedDiagArg1 << DelayedDiagArg2;
   DelayedDiagID = 0;
-  Report(ID) << DelayedDiagArg1 << DelayedDiagArg2;
   DelayedDiagArg1.clear();
   DelayedDiagArg2.clear();
 }

test/Index/KeepGoingWithLotsOfErrors.mm

@@ -1,29 +0,0 @@
-// RUN: env CINDEXTEST_KEEP_GOING=1 c-index-test -code-completion-at=%s:25:1 %s
-// Shouldn't crash!
-// This is the minimized test that triggered an infinite loop:
-
-+(BOOL) onEntity {
-}
-
--(const Object &) a_200 {
-}
-
--(int) struct {
-}
-
--(int) bar {
-}
-
--(int) part {
-}
-
-+(some_type_t) piece {
-}
-
-+(void) z_Z_42 {
-  ([self onEntity: [] { 42];
-  } class: ^ {  }
-];
-  [super];
-  BOOL struct;
-}