Name of addLayoutToClass is confusing as no layout calculation
is done. Layout is calculated lazily at code gen type.
This patch changes the name.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@61054 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index 50f45e8..7e2a99f 100644
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -377,10 +377,10 @@
return MemberDecl;
}
-/// addLayoutToClass - produces layout info. for the class for its
+/// addRecordToClass - produces record info. for the class for its
/// ivars and all those inherited.
///
-void ObjCInterfaceDecl::addLayoutToClass(ASTContext &Context)
+void ObjCInterfaceDecl::addRecordToClass(ASTContext &Context)
{
std::vector<FieldDecl*> RecFields;
CollectObjCIvars(RecFields);
diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp
index 3470cca..10b1e15 100644
--- a/lib/CodeGen/CodeGenTypes.cpp
+++ b/lib/CodeGen/CodeGenTypes.cpp
@@ -277,7 +277,7 @@
if(!RD) {
// Sometimes, class type is being directly generated in code gen for
// built-in class types.
- ID->addLayoutToClass(Context);
+ ID->addRecordToClass(Context);
RD = ID->getRecordForDecl();
}
return ConvertTagDeclType(cast<TagDecl>(RD));
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 577cc7a..1578a25 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2968,7 +2968,7 @@
ObjCIvarDecl **ClsFields = reinterpret_cast<ObjCIvarDecl**>(&RecFields[0]);
if (ObjCInterfaceDecl *ID = dyn_cast<ObjCInterfaceDecl>(EnclosingDecl)) {
ID->addInstanceVariablesToClass(ClsFields, RecFields.size(), RBrac);
- ID->addLayoutToClass(Context);
+ ID->addRecordToClass(Context);
}
else if (ObjCImplementationDecl *IMPDecl =
dyn_cast<ObjCImplementationDecl>(EnclosingDecl)) {
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 3545eb0..417803e 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -588,7 +588,7 @@
/// Add implementations's ivar to the synthesize class's ivar list.
if (IDecl->ImplicitInterfaceDecl()) {
IDecl->addInstanceVariablesToClass(ivars, numIvars, RBrace);
- IDecl->addLayoutToClass(Context);
+ IDecl->addRecordToClass(Context);
return;
}
// If implementation has empty ivar list, just return.