commit 0f962a8e61e1c094a89df17f9d3ad947d31c4e5c
author Douglas Gregor <dgregor@apple.com> Wed Feb 10 17:16:49 2010 +0000
committer Douglas Gregor <dgregor@apple.com> Wed Feb 10 17:16:49 2010 +0000
tree ada317fff9f2bf2614e59ee121af2c8c675c410a
parent 6b2accb4793e16b2e93a8c2589f5df702231f17a

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

lib/AST/ASTImporter.cpp

diff --git a/lib/AST/ASTImporter.cpp b/lib/AST/ASTImporter.cpp
index 75917cf..9fb695e 100644
--- a/lib/AST/ASTImporter.cpp
+++ b/lib/AST/ASTImporter.cpp
@@ -500,6 +500,33 @@
             break;
           }
 
+          if (const IncompleteArrayType *FoundArray
+                = Importer.getToContext().getAsIncompleteArrayType(
+                                                        FoundVar->getType())) {
+            if (const ConstantArrayType *TArray
+                  = Importer.getToContext().getAsConstantArrayType(T)) {
+              if (Importer.getToContext().typesAreCompatible(
+                                               TArray->getElementType(), 
+                                               FoundArray->getElementType())) {
+                FoundVar->setType(T);
+                MergeWithVar = FoundVar;
+                break;
+              }
+            }
+          } else if (const IncompleteArrayType *TArray
+                        = Importer.getToContext().getAsIncompleteArrayType(T)) {
+            if (const ConstantArrayType *FoundArray
+                   = Importer.getToContext().getAsConstantArrayType(
+                                                         FoundVar->getType())) {
+              if (Importer.getToContext().typesAreCompatible(
+                                               TArray->getElementType(), 
+                                               FoundArray->getElementType())) {
+                MergeWithVar = FoundVar;
+                break;
+              }
+            }
+          }
+
           Importer.ToDiag(Loc, diag::err_odr_variable_type_inconsistent)
             << Name << T << FoundVar->getType();
           Importer.ToDiag(FoundVar->getLocation(), diag::note_odr_value_here)

lib/Frontend/ASTMerge.cpp

diff --git a/lib/Frontend/ASTMerge.cpp b/lib/Frontend/ASTMerge.cpp
index d51647b..f2de09a 100644
--- a/lib/Frontend/ASTMerge.cpp
+++ b/lib/Frontend/ASTMerge.cpp
@@ -32,6 +32,8 @@
 
 void ASTMergeAction::ExecuteAction() {
   CompilerInstance &CI = getCompilerInstance();
+  CI.getDiagnostics().getClient()->BeginSourceFile(
+                                         CI.getASTContext().getLangOptions());
   CI.getDiagnostics().SetArgToStringFn(&FormatASTNodeDiagnosticArgument,
                                        &CI.getASTContext());
   for (unsigned I = 0, N = ASTFiles.size(); I != N; ++I) {
@@ -68,8 +70,8 @@
     delete Unit;
   }
 
-
-  return AdaptedAction->ExecuteAction();
+  AdaptedAction->ExecuteAction();
+  CI.getDiagnostics().getClient()->EndSourceFile();
 }
 
 void ASTMergeAction::EndSourceFileAction() {

test/ASTMerge/Inputs/var1.c

diff --git a/test/ASTMerge/Inputs/var1.c b/test/ASTMerge/Inputs/var1.c
index 4652589..4f5cbe1 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];

test/ASTMerge/Inputs/var2.c

diff --git a/test/ASTMerge/Inputs/var2.c b/test/ASTMerge/Inputs/var2.c
index e93a010..01986e4 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];

test/ASTMerge/var.c

diff --git a/test/ASTMerge/var.c b/test/ASTMerge/var.c
index 98ad7ab..06bebd5 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]'