diff options
| -rw-r--r-- | clang/include/clang/AST/DeclObjC.h | 2 | ||||
| -rw-r--r-- | clang/lib/AST/DeclObjC.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CodeGenTypes.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclObjC.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/clang/include/clang/AST/DeclObjC.h b/clang/include/clang/AST/DeclObjC.h index 333dcd34010..c9f5265542b 100644 --- a/clang/include/clang/AST/DeclObjC.h +++ b/clang/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/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp index 50f45e85798..7e2a99fb26b 100644 --- a/clang/lib/AST/DeclObjC.cpp +++ b/clang/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/clang/lib/CodeGen/CodeGenTypes.cpp b/clang/lib/CodeGen/CodeGenTypes.cpp index 3470cca4d15..10b1e15ae39 100644 --- a/clang/lib/CodeGen/CodeGenTypes.cpp +++ b/clang/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/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 577cc7a97e9..1578a253e91 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/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/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp index 3545eb0c0a0..417803e5c16 100644 --- a/clang/lib/Sema/SemaDeclObjC.cpp +++ b/clang/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. |
