diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-12-20 15:50:13 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-12-20 15:50:13 +0000 |
| commit | 64d9257e38a08bc836508a4159723bc1e39194ad (patch) | |
| tree | 23303a85a04123004ca3614e63cc57cf94cd085b /clang | |
| parent | ec7e6e09463a932bf01d64241888df85e692e665 (diff) | |
| download | bcm5719-llvm-64d9257e38a08bc836508a4159723bc1e39194ad.tar.gz bcm5719-llvm-64d9257e38a08bc836508a4159723bc1e39194ad.zip | |
When performing layout for an Objective-C class, make sure to dig out
the definition of that class. Fixes PR11613 / <rdar://problem/10604077>.
llvm-svn: 146976
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/AST/RecordLayoutBuilder.cpp | 4 | ||||
| -rw-r--r-- | clang/test/CodeGenObjC/forward-class-impl-metadata.m | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp index a47bd4afb43..43dee104ba3 100644 --- a/clang/lib/AST/RecordLayoutBuilder.cpp +++ b/clang/lib/AST/RecordLayoutBuilder.cpp @@ -2161,7 +2161,9 @@ const CXXMethodDecl *ASTContext::getKeyFunction(const CXXRecordDecl *RD) { const ASTRecordLayout & ASTContext::getObjCLayout(const ObjCInterfaceDecl *D, const ObjCImplementationDecl *Impl) const { - assert(D->isThisDeclarationADefinition() && "Invalid interface decl!"); + // Retrieve the definition + D = D->getDefinition(); + assert(D && D->isThisDeclarationADefinition() && "Invalid interface decl!"); // Look up this layout, if already laid out, return what we have. ObjCContainerDecl *Key = diff --git a/clang/test/CodeGenObjC/forward-class-impl-metadata.m b/clang/test/CodeGenObjC/forward-class-impl-metadata.m index e9e08589d19..371abf2ade9 100644 --- a/clang/test/CodeGenObjC/forward-class-impl-metadata.m +++ b/clang/test/CodeGenObjC/forward-class-impl-metadata.m @@ -39,3 +39,9 @@ int f0(A *a) { @implementation A @synthesize p0 = _p0; @end + +@interface B +@end +@class B; +@implementation B +@end |
