diff options
| -rw-r--r-- | lib/Frontend/ASTUnit.cpp | 10 | ||||
| -rw-r--r-- | test/Index/pragma-diag-reparse.c | 13 |
2 files changed, 12 insertions, 11 deletions
diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp index 015e92dfcd..0dd3a38da4 100644 --- a/lib/Frontend/ASTUnit.cpp +++ b/lib/Frontend/ASTUnit.cpp @@ -1388,8 +1388,6 @@ llvm::MemoryBuffer *ASTUnit::getMainBufferWithPrecompiledPreamble( // Set the state of the diagnostic object to mimic its state // after parsing the preamble. - // FIXME: This won't catch any #pragma push warning changes that - // have occurred in the preamble. getDiagnostics().Reset(); ProcessWarningOptions(getDiagnostics(), PreambleInvocation->getDiagnosticOpts()); @@ -1940,11 +1938,9 @@ bool ASTUnit::Reparse(RemappedFile *RemappedFiles, unsigned NumRemappedFiles) { OverrideMainBuffer = getMainBufferWithPrecompiledPreamble(*Invocation); // Clear out the diagnostics state. - if (!OverrideMainBuffer) { - getDiagnostics().Reset(); - ProcessWarningOptions(getDiagnostics(), Invocation->getDiagnosticOpts()); - } - + getDiagnostics().Reset(); + ProcessWarningOptions(getDiagnostics(), Invocation->getDiagnosticOpts()); + // Parse the sources bool Result = Parse(OverrideMainBuffer); diff --git a/test/Index/pragma-diag-reparse.c b/test/Index/pragma-diag-reparse.c index efe59b1778..1dccd59523 100644 --- a/test/Index/pragma-diag-reparse.c +++ b/test/Index/pragma-diag-reparse.c @@ -1,13 +1,18 @@ -// RUN: env CINDEXTEST_EDITING=1 c-index-test -test-load-source-reparse 5 local %s | FileCheck %s +#pragma clang diagnostic ignored "-Wtautological-compare" int main (int argc, const char * argv[]) { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - int x; + int x=0; #pragma clang diagnostic pop - return 0; + return x; } -// CHECK: pragma-diag-reparse.c:7:7: VarDecl=x:7:7 (Definition) Extent=[7:3 - 7:8] +void foo() { int b=0; while (b==b); } + +// RUN: env CINDEXTEST_EDITING=1 CINDEXTEST_FAILONERROR=1 c-index-test -test-load-source-reparse 5 local \ +// RUN: %s -Wall -Werror | FileCheck %s + +// CHECK: pragma-diag-reparse.c:7:7: VarDecl=x:7:7 (Definition) Extent=[7:3 - 7:10] |