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

3 files changed, 13 insertions, 0 deletions

diff --git a/clang/test/ASTMerge/Inputs/class1.cpp b/clang/test/ASTMerge/Inputs/class1.cpp
index b600cdb1fcf..0cd6565f1a9 100644
--- a/clang/test/ASTMerge/Inputs/class1.cpp
+++ b/clang/test/ASTMerge/Inputs/class1.cpp
@@ -13,3 +13,7 @@ struct C {
   C &operator=(C&);
   ~C();
 };
+
+enum E {
+  b = 1
+};
diff --git a/clang/test/ASTMerge/Inputs/class2.cpp b/clang/test/ASTMerge/Inputs/class2.cpp
index fa38916f5e2..5d5d9ca2333 100644
--- a/clang/test/ASTMerge/Inputs/class2.cpp
+++ b/clang/test/ASTMerge/Inputs/class2.cpp
@@ -7,3 +7,7 @@ struct B : A {
   int foo();
 };
 
+enum E {
+  a = 0,
+  b = 1
+};
diff --git a/clang/test/ASTMerge/class.cpp b/clang/test/ASTMerge/class.cpp
index 114687f8d98..885b65e983a 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