3 files changed, 48 insertions, 0 deletions
diff --git a/clang/test/ASTMerge/class/Inputs/class1.cpp b/clang/test/ASTMerge/class/Inputs/class1.cpp
new file mode 100644
index 00000000000..b0a7645cfe6
--- /dev/null
+++ b/clang/test/ASTMerge/class/Inputs/class1.cpp
@@ -0,0 +1,20 @@
+struct A {
+  public:
+    int x;
+};
+
+struct B : A {
+  float y;
+  float foo();
+};
+
+struct C {
+  C(int i = 10);
+  C(const C&);
+  C &operator=(C&);
+  ~C();
+};
+
+enum E {
+  b = 1
+};
diff --git a/clang/test/ASTMerge/class/Inputs/class2.cpp b/clang/test/ASTMerge/class/Inputs/class2.cpp
new file mode 100644
index 00000000000..2bed6d775bc
--- /dev/null
+++ b/clang/test/ASTMerge/class/Inputs/class2.cpp
@@ -0,0 +1,14 @@
+struct A {
+  public:
+    int x;
+};
+
+struct B : A {
+  int y;
+  int foo();
+};
+
+enum E {
+  a = 0,
+  b = 1
+};
diff --git a/clang/test/ASTMerge/class/test.cpp b/clang/test/ASTMerge/class/test.cpp
new file mode 100644
index 00000000000..a68a2d1d769
--- /dev/null
+++ b/clang/test/ASTMerge/class/test.cpp
@@ -0,0 +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 -Werror
+
+// CHECK: class1.cpp:6:8: warning: type 'B' has incompatible definitions in different translation units
+// CHECK: class1.cpp:7:9: note: field 'y' has type 'float' here
+// CHECK: class2.cpp:7:7: note: field 'y' has type 'int' here
+
+// FIXME: we should also complain about mismatched types on the method
+
+// CHECK: class1.cpp:18:6: warning: type 'E' has incompatible definitions in different translation units
+// CHECK: class1.cpp:19:3: note: enumerator 'b' with value 1 here
+// CHECK: class2.cpp:12:3: note: enumerator 'a' with value 0 here