aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2008-12-15 21:58:08 +0000
committerFariborz Jahanian <fjahanian@apple.com>2008-12-15 21:58:08 +0000
commit9ee92e84ecf085ccbe6f877d1c6e1500961bbbce (patch)
treebccb5d2d6034a1182cae17af0bb4e50fabdefb30
parent9e7d9de3ef538c1473248238b76a6d7b16f5f684 (diff)
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
-rw-r--r--include/clang/AST/DeclObjC.h2
-rw-r--r--lib/AST/DeclObjC.cpp4
-rw-r--r--lib/CodeGen/CodeGenTypes.cpp2
-rw-r--r--lib/Sema/SemaDecl.cpp2
-rw-r--r--lib/Sema/SemaDeclObjC.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/include/clang/AST/DeclObjC.h b/include/clang/AST/DeclObjC.h
index 333dcd3401..c9f5265542 100644
--- 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 50f45e8579..7e2a99fb26 100644
--- 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 3470cca4d1..10b1e15ae3 100644
--- 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 577cc7a97e..1578a253e9 100644
--- 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 3545eb0c0a..417803e5c1 100644
--- 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.