aboutsummaryrefslogtreecommitdiff
path: root/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
commit0f962a8e61e1c094a89df17f9d3ad947d31c4e5c (patch)
treeada317fff9f2bf2614e59ee121af2c8c675c410a /test/ASTMerge/Inputs
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/Inputs')
-rw-r--r--test/ASTMerge/Inputs/var1.c4
-rw-r--r--test/ASTMerge/Inputs/var2.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/test/ASTMerge/Inputs/var1.c b/test/ASTMerge/Inputs/var1.c
index 465258988b..4f5cbe16ab 100644
--- a/test/ASTMerge/Inputs/var1.c
+++ b/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/test/ASTMerge/Inputs/var2.c b/test/ASTMerge/Inputs/var2.c
index e93a010cbf..01986e4208 100644
--- a/test/ASTMerge/Inputs/var2.c
+++ b/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];