r302046 - Revert r302037

[Alex Lorenz via cfe-commits]

Author: arphaman
Date: Wed May  3 11:22:16 2017
New Revision: 302046

URL: http://llvm.org/viewvc/llvm-project?rev=302046&view=rev
Log:
Revert r302037

The commit caused the following two buildbot failures:

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

Removed:
    cfe/trunk/test/Index/KeepGoingWithLotsOfErrors.mm
Modified:
    cfe/trunk/lib/Basic/Diagnostic.cpp

Modified: cfe/trunk/lib/Basic/Diagnostic.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Diagnostic.cpp?rev=302046&r1=302045&r2=302046&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Diagnostic.cpp (original)
+++ cfe/trunk/lib/Basic/Diagnostic.cpp Wed May  3 11:22:16 2017
@@ -146,9 +146,8 @@ void DiagnosticsEngine::SetDelayedDiagno
 }
 
 void DiagnosticsEngine::ReportDelayed() {
-  unsigned ID = DelayedDiagID;
+  Report(DelayedDiagID) << DelayedDiagArg1 << DelayedDiagArg2;
   DelayedDiagID = 0;
-  Report(ID) << DelayedDiagArg1 << DelayedDiagArg2;
   DelayedDiagArg1.clear();
   DelayedDiagArg2.clear();
 }

Removed: cfe/trunk/test/Index/KeepGoingWithLotsOfErrors.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/KeepGoingWithLotsOfErrors.mm?rev=302045&view=auto
==============================================================================
--- cfe/trunk/test/Index/KeepGoingWithLotsOfErrors.mm (original)
+++ cfe/trunk/test/Index/KeepGoingWithLotsOfErrors.mm (removed)
@@ -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;
-}