diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-12-20 02:22:15 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-12-20 02:22:15 +0000 |
| commit | 5bb4cdfaa92f6346982f7705f7f53df67116fc96 (patch) | |
| tree | 10daff97f5d5058e73a146c509e027d5cacf592a /clang/test/ASTMerge/class.cpp | |
| parent | 4419449391a16f39058f637658ebe10106bd1c67 (diff) | |
| download | llvm-5bb4cdfaa92f6346982f7705f7f53df67116fc96.zip llvm-5bb4cdfaa92f6346982f7705f7f53df67116fc96.tar.gz llvm-5bb4cdfaa92f6346982f7705f7f53df67116fc96.tar.bz2 | |
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
Diffstat (limited to 'clang/test/ASTMerge/class.cpp')
| -rw-r--r-- | clang/test/ASTMerge/class.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/test/ASTMerge/class.cpp b/clang/test/ASTMerge/class.cpp index 114687f..885b65e 100644 --- a/clang/test/ASTMerge/class.cpp +++ b/clang/test/ASTMerge/class.cpp @@ -1,9 +1,14 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/class1.cpp // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/class2.cpp // RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 -Wno-odr | count 0 // CHECK: class1.cpp:5:8: warning: type 'B' has incompatible definitions in different translation units // CHECK: class1.cpp:6:9: note: field 'y' has type 'float' here // CHECK: class2.cpp:6:7: note: field 'y' has type 'int' here // FIXME: we should also complain about mismatched types on the method + +// CHECK: class1.cpp:17:6: warning: type 'E' has incompatible definitions in different translation units +// CHECK: class1.cpp:18:3: note: enumerator 'b' with value 1 here +// CHECK: class2.cpp:11:3: note: enumerator 'a' with value 0 here |