diff options
author | Douglas Gregor <dgregor@apple.com> | 2010-02-10 17:16:49 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2010-02-10 17:16:49 +0000 |
commit | 2fbe558cfe8de9e6c3fb1a8728e91df3d16d0413 (patch) | |
tree | d3c7f32872a510ba108c473bb4640f0df737387a /clang/test/ASTMerge/var.c | |
parent | 4a618827de7c540c68685789d1eb9b2b50cdc33f (diff) | |
download | bcm5719-llvm-2fbe558cfe8de9e6c3fb1a8728e91df3d16d0413.tar.gz bcm5719-llvm-2fbe558cfe8de9e6c3fb1a8728e91df3d16d0413.zip |
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.
llvm-svn: 95782
Diffstat (limited to 'clang/test/ASTMerge/var.c')
-rw-r--r-- | clang/test/ASTMerge/var.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/test/ASTMerge/var.c b/clang/test/ASTMerge/var.c index 98ad7ab4a07..06bebd5ee89 100644 --- a/clang/test/ASTMerge/var.c +++ b/clang/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]' |