diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-08-11 12:19:30 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-08-11 12:19:30 +0000 |
| commit | 1c28331b57df1b99af4ff5dcb409cafbe171795c (patch) | |
| tree | cbef2c4e46eb07858e8707ce48629bf73023ea67 /clang/lib/Frontend/PCHWriterDecl.cpp | |
| parent | 6a98131468162950c22a866d736e66e300fb2803 (diff) | |
| download | bcm5719-llvm-1c28331b57df1b99af4ff5dcb409cafbe171795c.tar.gz bcm5719-llvm-1c28331b57df1b99af4ff5dcb409cafbe171795c.zip | |
Speculatively revert r110610 " Make ObjCInterfaceDecl redeclarable,
and create separate decl nodes for forward declarations and the
definition," which appears to be causing significant Objective-C
breakage.
llvm-svn: 110803
Diffstat (limited to 'clang/lib/Frontend/PCHWriterDecl.cpp')
| -rw-r--r-- | clang/lib/Frontend/PCHWriterDecl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/Frontend/PCHWriterDecl.cpp b/clang/lib/Frontend/PCHWriterDecl.cpp index 9917ad64194..a509ed1dce9 100644 --- a/clang/lib/Frontend/PCHWriterDecl.cpp +++ b/clang/lib/Frontend/PCHWriterDecl.cpp @@ -340,9 +340,6 @@ void PCHDeclWriter::VisitObjCContainerDecl(ObjCContainerDecl *D) { void PCHDeclWriter::VisitObjCInterfaceDecl(ObjCInterfaceDecl *D) { VisitObjCContainerDecl(D); - Record.push_back(D->isForwardDecl()); - Record.push_back(D->isImplicitInterfaceDecl()); - VisitRedeclarable(D); Writer.AddTypeRef(QualType(D->getTypeForDecl(), 0), Record); Writer.AddDeclRef(D->getSuperClass(), Record); Record.push_back(D->protocol_size()); @@ -359,6 +356,8 @@ void PCHDeclWriter::VisitObjCInterfaceDecl(ObjCInterfaceDecl *D) { IEnd = D->ivar_end(); I != IEnd; ++I) Writer.AddDeclRef(*I, Record); Writer.AddDeclRef(D->getCategoryList(), Record); + Record.push_back(D->isForwardDecl()); + Record.push_back(D->isImplicitInterfaceDecl()); Writer.AddSourceLocation(D->getClassLoc(), Record); Writer.AddSourceLocation(D->getSuperClassLoc(), Record); Writer.AddSourceLocation(D->getLocEnd(), Record); |
