MergeAttributes(New, Old);
- // Verify the types match.
- QualType OldCType = Context.getCanonicalType(Old->getType());
- QualType NewCType = Context.getCanonicalType(New->getType());
- if (OldCType != NewCType && !Context.typesAreCompatible(OldCType, NewCType)) {
+ // Merge the types
+ QualType MergedT = Context.mergeTypes(New->getType(), Old->getType());
+ if (MergedT.isNull()) {
Diag(New->getLocation(), diag::err_redefinition_different_type)
<< New->getDeclName();
Diag(Old->getLocation(), diag::note_previous_definition);
return New;
}
+ New->setType(MergedT);
// C99 6.2.2p4: Check if we have a static decl followed by a non-static.
if (New->getStorageClass() == VarDecl::Static &&
(Old->getStorageClass() == VarDecl::None ||
--- /dev/null
+// RUN: clang -fsyntax-only -std=c99 -verify -pedantic %s
+
+int x[10];
+int x[] = {1,2,3};
+int testx[(sizeof(x) == sizeof(int) * 10) ? 1 : -1];
+
+int (*a)(int (*x)[10], int (*y)[]);
+int (*a)(int (*x)[], int (*y)[5]);
+int b() {
+int x[10], y[5];
+a(&x, &y);
+a(&y, &y); // expected-warning {{incompatible pointer}}
+a(&x, &x); // expected-warning {{incompatible pointer}}
+}
+
+