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)
commit5bb4cdfaa92f6346982f7705f7f53df67116fc96
tree10daff97f5d5058e73a146c509e027d5cacf592a
parent4419449391a16f39058f637658ebe10106bd1c67
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.

llvm-svn: 170636
clang/include/clang/AST/ASTImporter.h
clang/include/clang/Basic/Diagnostic.h
clang/include/clang/Basic/DiagnosticASTKinds.td
clang/lib/AST/ASTImporter.cpp
clang/lib/Basic/Diagnostic.cpp
clang/lib/Driver/Driver.cpp
clang/test/ASTMerge/Inputs/class1.cpp
clang/test/ASTMerge/Inputs/class2.cpp
clang/test/ASTMerge/class.cpp
clang/test/Misc/warning-flags.c