[cfe-commits] r160526 - in /cfe/trunk: lib/Sema/SemaDecl.cpp test/CodeGenObjC/layout-bitfield-crash.m

[Eric Christopher]

Author: echristo
Date: Thu Jul 19 17:22:51 2012
New Revision: 160526

URL: http://llvm.org/viewvc/llvm-project?rev=160526&view=rev
Log:
Reset the layout of an ObjC class if we see an ivar in a category
or implementation since we've now got a different layout.

Fixes rdar://11842763

Added:
    cfe/trunk/test/CodeGenObjC/layout-bitfield-crash.m
Modified:
    cfe/trunk/lib/Sema/SemaDecl.cpp

Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=160526&r1=160525&r2=160526&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Thu Jul 19 17:22:51 2012
@@ -9802,6 +9802,23 @@
   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

Added: cfe/trunk/test/CodeGenObjC/layout-bitfield-crash.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/layout-bitfield-crash.m?rev=160526&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenObjC/layout-bitfield-crash.m (added)
+++ cfe/trunk/test/CodeGenObjC/layout-bitfield-crash.m Thu Jul 19 17:22:51 2012
@@ -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.
+ at class Foo;
+typedef struct Bar *BarRef;
+
+ at interface Baz
+ at end
+
+ at interface Foo
+- (void) setFlag;
+ at end
+
+ at implementation Baz
+
+- (void) a:(BarRef)b
+{
+  Foo* view = (Foo*)self;
+  [view setFlag];
+}
+
+ at end
+
+
+ at implementation Foo
+{
+  int flag : 1;
+}
+
+- (void) setFlag
+{
+  if (!flag)
+    flag = 1;
+}
+
+ at end