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/include/clang/AST/DeclObjC.h b/include/clang/AST/DeclObjC.h
index 333dcd34010280bb4d6ff2856b919f7d277ef38c..c9f5265542bd52b552d9ecf2e179b311ae1ee084 100644 (file)
--- a/include/clang/AST/DeclObjC.h
+++ b/include/clang/AST/DeclObjC.h
@@ -386,7 +386,7 @@ public:
                                    SourceLocation RBracLoc);
   FieldDecl *lookupFieldDeclForIvar(ASTContext &Context, 
                                     const ObjCIvarDecl *ivar);
-  void addLayoutToClass(ASTContext &Context);
+  void addRecordToClass(ASTContext &Context);
 
   void addMethods(ObjCMethodDecl **insMethods, unsigned numInsMembers,
                   ObjCMethodDecl **clsMethods, unsigned numClsMembers,

diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index 50f45e85798c883bf4178ec12228514be389b6ac..7e2a99fb26b2b66f4628774224b303e9717616c5 100644 (file)
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -377,10 +377,10 @@ FieldDecl *ObjCInterfaceDecl::lookupFieldDeclForIvar(ASTContext &Context,
   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 3470cca4d155f9bcfd189a167555ce265c3da0ec..10b1e15ae399cfa7ef1b068d3b655c262690ea2a 100644 (file)
--- a/lib/CodeGen/CodeGenTypes.cpp
+++ b/lib/CodeGen/CodeGenTypes.cpp
@@ -277,7 +277,7 @@ const llvm::Type *CodeGenTypes::ConvertNewType(QualType T) {
     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 577cc7a97e90b88a5640f8ddb216c7fbe637fcb9..1578a253e919b740add89c673b0c5e32bf2fb820 100644 (file)
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2968,7 +2968,7 @@ void Sema::ActOnFields(Scope* S,
     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 3545eb0c0a07150fffbd6b68567fae938c6979d7..417803e5c16f29489b7ad4824b5cecff895bf717 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -588,7 +588,7 @@ void Sema::CheckImplementationIvars(ObjCImplementationDecl *ImpDecl,
   /// 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.