summaryrefslogtreecommitdiff
path: root/test/ASTMerge
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2010-06-03 19:28:45 +0000
committerJohn McCall <rjmccall@apple.com>2010-06-03 19:28:45 +0000
commit5250f27420386452a21692a6292c99ee7febdac4 (patch)
tree94b044a9f5598be6e138b77c6df915ca522e4e11 /test/ASTMerge
parentdf432e338c68e0e06dd7644c43f3f218750b3d58 (diff)
Hack in some really terrible C++ record PCH support that I need right now.
This is required in order to test: The ASTImporter should set base classes after formally entering the definition. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@105401 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ASTMerge')
-rw-r--r--test/ASTMerge/Inputs/class1.cpp8
-rw-r--r--test/ASTMerge/Inputs/class2.cpp8
-rw-r--r--test/ASTMerge/class.cpp9
3 files changed, 25 insertions, 0 deletions
diff --git a/test/ASTMerge/Inputs/class1.cpp b/test/ASTMerge/Inputs/class1.cpp
new file mode 100644
index 0000000000..e13faf0539
--- /dev/null
+++ b/test/ASTMerge/Inputs/class1.cpp
@@ -0,0 +1,8 @@
+struct A {
+ int x;
+};
+
+struct B : A {
+ float y;
+ float foo();
+};
diff --git a/test/ASTMerge/Inputs/class2.cpp b/test/ASTMerge/Inputs/class2.cpp
new file mode 100644
index 0000000000..91b84dc13b
--- /dev/null
+++ b/test/ASTMerge/Inputs/class2.cpp
@@ -0,0 +1,8 @@
+struct A {
+ int x;
+};
+
+struct B : A {
+ int y;
+ int foo();
+};
diff --git a/test/ASTMerge/class.cpp b/test/ASTMerge/class.cpp
new file mode 100644
index 0000000000..114687f8d9
--- /dev/null
+++ b/test/ASTMerge/class.cpp
@@ -0,0 +1,9 @@
+// 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
+
+// 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