diff options
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index a72ca1d01f..8074ab94bf 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -985,8 +985,14 @@ void Sema::MergeVarDecl(VarDecl *New, Decl *OldD) { // unknown size and therefore be incomplete at one point in a // translation unit and complete later on; [...] else if (Old->getType()->isIncompleteArrayType() && - New->getType()->isArrayType()) - MergedT = New->getType(); + New->getType()->isArrayType()) { + CanQual<ArrayType> OldArray + = Context.getCanonicalType(Old->getType())->getAs<ArrayType>(); + CanQual<ArrayType> NewArray + = Context.getCanonicalType(New->getType())->getAs<ArrayType>(); + if (OldArray->getElementType() == NewArray->getElementType()) + MergedT = New->getType(); + } } else { MergedT = Context.mergeTypes(New->getType(), Old->getType()); } |