aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/AST/DeclObjC.cpp2
-rw-r--r--lib/Sema/SemaDecl.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index f22b5b435b..27e6a6df65 100644
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -396,7 +396,7 @@ void ObjCInterfaceDecl::addLayoutToClass(ASTContext &Context)
RD->addDecl(Context, Field);
}
RD->completeDefinition(Context);
- setRecordForDecl(RD);
+ RecordForDecl = RD;
}
/// ObjCAddInstanceVariablesToClassImpl - Checks for correctness of Instance
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 17a6617f37..fbf89ae311 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2574,6 +2574,8 @@ Sema::DeclTy *Sema::ActOnTag(Scope *S, unsigned TagType, TagKind TK,
/// Collect the instance variables declared in an Objective-C object. Used in
/// the creation of structures from objects using the @defs directive.
+/// FIXME: This should be consolidated with CollectObjCIvars as it is also
+/// part of the AST generation logic of @defs.
static void CollectIvars(ObjCInterfaceDecl *Class, RecordDecl *Record,
ASTContext& Ctx,
llvm::SmallVectorImpl<Sema::DeclTy*> &ivars) {