1 files changed, 14 insertions, 2 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 4a1fb39bb60..d8e2c06fc03 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -405,10 +405,22 @@ ASTContext::getASTObjCInterfaceLayout(const ObjCInterfaceDecl *D) {
 
   // Allocate and assign into ASTRecordLayouts here.  The "Entry" reference can
   // be invalidated (dangle) if the ASTRecordLayouts hashtable is inserted into.
-  ASTRecordLayout *NewEntry = new ASTRecordLayout();
+  ASTRecordLayout *NewEntry = NULL;
+  unsigned FieldCount = D->ivar_size();
+  if (ObjCInterfaceDecl *SD = D->getSuperClass()) {
+    FieldCount++;
+    const ASTRecordLayout &SL = getASTObjCInterfaceLayout(SD);
+    unsigned Alignment = SL.getAlignment();
+    uint64_t Size = SL.getSize();
+    NewEntry = new ASTRecordLayout(Size, Alignment);
+    NewEntry->InitializeLayout(FieldCount);
+    NewEntry->SetFieldOffset(0, 0); // Super class is at the beginning of the layout.
+  } else {
+    NewEntry = new ASTRecordLayout();
+    NewEntry->InitializeLayout(FieldCount);
+  }
   Entry = NewEntry;
 
-  NewEntry->InitializeLayout(D->ivar_size());
   bool IsPacked = D->getAttr<PackedAttr>();
 
   if (const AlignedAttr *AA = D->getAttr<AlignedAttr>())