replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When importing an ObjCInterfaceDecl, ensure that 

superclass information is imported before validating
it.  This fixes spurious "incompatible superclasses"
errors in LLDB.

llvm-svn: 144393
This commit is contained in:
Sean Callanan 2011-11-11 17:39:52 +00:00
parent c391f7ff64
commit 45e1328f3f
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clang/lib/AST/ASTImporter.cpp
View File

@ -3220,6 +3220,17 @@ Decl *ASTNodeImporter::VisitObjCInterfaceDecl(ObjCInterfaceDecl *D) {
// Check for consistency of superclasses.
DeclarationName FromSuperName, ToSuperName;
// If the superclass hasn't been imported yet, do so before checking.
ObjCInterfaceDecl *DSuperClass = D->getSuperClass();
ObjCInterfaceDecl *ToIfaceSuperClass = ToIface->getSuperClass();
if (DSuperClass && !ToIfaceSuperClass) {
Decl *ImportedSuperClass = Importer.Import(DSuperClass);
ObjCInterfaceDecl *ImportedSuperIface = cast<ObjCInterfaceDecl>(ImportedSuperClass);
ToIface->setSuperClass(ImportedSuperIface);
}
if (D->getSuperClass())
FromSuperName = Importer.Import(D->getSuperClass()->getDeclName());
if (ToIface->getSuperClass())