aboutsummaryrefslogtreecommitdiff
path: root/test/ASTMerge/var.c
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-02-10 17:16:49 +0000
committerDouglas Gregor <dgregor@apple.com>2010-02-10 17:16:49 +0000
commit0f962a8e61e1c094a89df17f9d3ad947d31c4e5c (patch)
treeada317fff9f2bf2614e59ee121af2c8c675c410a /test/ASTMerge/var.c
parent6b2accb4793e16b2e93a8c2589f5df702231f17a (diff)
Teach AST merging that variables with incomplete array types can be
merged with variables of constant array types. Also, make sure that we call DiagnosticClient's BeginSourceFile/EndSourceFile, so that it has a LangOptions to work with. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95782 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ASTMerge/var.c')
-rw-r--r--test/ASTMerge/var.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/ASTMerge/var.c b/test/ASTMerge/var.c
index 98ad7ab4a0..06bebd5ee8 100644
--- a/test/ASTMerge/var.c
+++ b/test/ASTMerge/var.c
@@ -7,3 +7,5 @@
// CHECK: var2.c:3:5: error: external variable 'x2' declared with incompatible types in different translation units ('int' vs. 'double')
// CHECK: In file included from{{.*}}var1.c:3:
// CHECK: var1.h:1:8: note: declared here with type 'double'
+// CHECK: error: external variable 'xarray3' declared with incompatible types in different translation units ('int [17]' vs. 'int [18]')
+// CHECK: var1.c:7:5: note: declared here with type 'int [18]'