summaryrefslogtreecommitdiffstats
path: root/clang/test/ASTMerge/Inputs
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
commit2fbe558cfe8de9e6c3fb1a8728e91df3d16d0413 (patch)
treed3c7f32872a510ba108c473bb4640f0df737387a /clang/test/ASTMerge/Inputs
parent4a618827de7c540c68685789d1eb9b2b50cdc33f (diff)
downloadbcm5719-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/Inputs')
-rw-r--r--clang/test/ASTMerge/Inputs/var1.c4
-rw-r--r--clang/test/ASTMerge/Inputs/var2.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/clang/test/ASTMerge/Inputs/var1.c b/clang/test/ASTMerge/Inputs/var1.c
index 465258988b0..4f5cbe16ab6 100644
--- a/clang/test/ASTMerge/Inputs/var1.c
+++ b/clang/test/ASTMerge/Inputs/var1.c
@@ -1,3 +1,7 @@
int *x0;
float **x1;
#include "var1.h"
+int xarray0[17];
+int xarray1[];
+int xarray2[18];
+int xarray3[18];
diff --git a/clang/test/ASTMerge/Inputs/var2.c b/clang/test/ASTMerge/Inputs/var2.c
index e93a010cbfe..01986e4208c 100644
--- a/clang/test/ASTMerge/Inputs/var2.c
+++ b/clang/test/ASTMerge/Inputs/var2.c
@@ -1,3 +1,7 @@
int *x0;
double *x1;
int x2;
+int xarray0[17];
+int xarray1[17];
+int xarray2[];
+int xarray3[17];
OpenPOWER on IntegriCloud