diff options
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 17 | ||||
| -rw-r--r-- | test/CodeGenObjC/layout-bitfield-crash.m | 35 |
2 files changed, 52 insertions, 0 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 4ea8df8b66..430ce9f7f7 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -9802,6 +9802,23 @@ void Sema::ActOnFields(Scope* S, if (EnclosingDecl->isInvalidDecl()) return; + // If this is an Objective-C @implementation or category and we have + // new fields here we should reset the layout of the interface since + // it will now change. + if (!Fields.empty() && isa<ObjCContainerDecl>(EnclosingDecl)) { + ObjCContainerDecl *DC = cast<ObjCContainerDecl>(EnclosingDecl); + switch (DC->getKind()) { + default: break; + case Decl::ObjCCategory: + Context.ResetObjCLayout(cast<ObjCCategoryDecl>(DC)->getClassInterface()); + break; + case Decl::ObjCImplementation: + Context. + ResetObjCLayout(cast<ObjCImplementationDecl>(DC)->getClassInterface()); + break; + } + } + RecordDecl *Record = dyn_cast<RecordDecl>(EnclosingDecl); // Start counting up the number of named members; make sure to include diff --git a/test/CodeGenObjC/layout-bitfield-crash.m b/test/CodeGenObjC/layout-bitfield-crash.m new file mode 100644 index 0000000000..7e6e77ea7a --- /dev/null +++ b/test/CodeGenObjC/layout-bitfield-crash.m @@ -0,0 +1,35 @@ +// RUN: %clang_cc1 -triple x86_64-apple-darwin11 -fobjc-runtime=macosx-10.7 -fobjc-gc -emit-llvm -g -o - %s +// Check that this doesn't crash when compiled with debugging on. +@class Foo; +typedef struct Bar *BarRef; + +@interface Baz +@end + +@interface Foo +- (void) setFlag; +@end + +@implementation Baz + +- (void) a:(BarRef)b +{ + Foo* view = (Foo*)self; + [view setFlag]; +} + +@end + + +@implementation Foo +{ + int flag : 1; +} + +- (void) setFlag +{ + if (!flag) + flag = 1; +} + +@end |