]> granicus.if.org Git - clang/commit
Fix code that attempted to produce a diagnostic with one DiagnosticEngine, then
authorRichard Smith <richard-llvm@metafoo.co.uk>
Thu, 20 Dec 2012 02:22:15 +0000 (02:22 +0000)
committerRichard Smith <richard-llvm@metafoo.co.uk>
Thu, 20 Dec 2012 02:22:15 +0000 (02:22 +0000)
commit5b9268f26ac53a74d2c504279fe577d988d5615d
tree5e408834de6e2933211c24bba04b91aacca2a551
parent88d158c631c4c08831855f601990f36f2234f975
Fix code that attempted to produce a diagnostic with one DiagnosticEngine, then
produce a note for that diagnostic either with a different DiagnosticEngine or
after calling DiagnosticEngine::Reset(). That didn't make any sense, and did the
wrong thing if the original diagnostic was suppressed.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170636 91177308-0d34-0410-b5e6-96231b3b80d8
include/clang/AST/ASTImporter.h
include/clang/Basic/Diagnostic.h
include/clang/Basic/DiagnosticASTKinds.td
lib/AST/ASTImporter.cpp
lib/Basic/Diagnostic.cpp
lib/Driver/Driver.cpp
test/ASTMerge/Inputs/class1.cpp
test/ASTMerge/Inputs/class2.cpp
test/ASTMerge/class.cpp
test/Misc/warning-flags.c