Partial fix for struct compatibility; there's still something messy
going on with mixing scopes, though.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@47152 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/AST/ASTContext.cpp b/AST/ASTContext.cpp
index d01de2b..d4a689c 100644
--- a/AST/ASTContext.cpp
+++ b/AST/ASTContext.cpp
@@ -1555,22 +1555,14 @@
// C99 6.2.7p1: If both are complete types, then the following additional
// requirements apply...FIXME (handle compatibility across source files).
bool ASTContext::tagTypesAreCompatible(QualType lhs, QualType rhs) {
- TagDecl *ldecl = cast<TagType>(lhs.getCanonicalType())->getDecl();
- TagDecl *rdecl = cast<TagType>(rhs.getCanonicalType())->getDecl();
-
- if (ldecl->getKind() == Decl::Struct && rdecl->getKind() == Decl::Struct) {
- if (ldecl->getIdentifier() == rdecl->getIdentifier())
- return true;
- }
- if (ldecl->getKind() == Decl::Union && rdecl->getKind() == Decl::Union) {
- if (ldecl->getIdentifier() == rdecl->getIdentifier())
- return true;
- }
// "Class" and "id" are compatible built-in structure types.
if (isObjCIdType(lhs) && isObjCClassType(rhs) ||
isObjCClassType(lhs) && isObjCIdType(rhs))
return true;
- return false;
+
+ // Within a translation unit a tag type is
+ // only compatible with itself.
+ return lhs.getCanonicalType() == rhs.getCanonicalType();
}
bool ASTContext::pointerTypesAreCompatible(QualType lhs, QualType rhs) {