From 3379e9bd71c0e0051bd97e90d4f2ec964078091d Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Wed, 24 Nov 2010 19:57:04 +0000 Subject: [PATCH] Simplify code. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@120109 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGRecordLayoutBuilder.cpp | 14 +------------- lib/CodeGen/CodeGenTypes.cpp | 8 +------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp index ce42a6aaaa..f846fca506 100644 --- a/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -140,9 +140,6 @@ private: unsigned getTypeAlignment(const llvm::Type *Ty) const; - /// getCGRecordLayout - Return the CGRecordLayout for the given record. - const CGRecordLayout &getCGRecordLayout(const CXXRecordDecl *RD); - /// CheckZeroInitializable - Check if the given type contains a pointer /// to data member. void CheckZeroInitializable(QualType T); @@ -689,15 +686,6 @@ unsigned CGRecordLayoutBuilder::getTypeAlignment(const llvm::Type *Ty) const { return Types.getTargetData().getABITypeAlignment(Ty); } -const CGRecordLayout & -CGRecordLayoutBuilder::getCGRecordLayout(const CXXRecordDecl *RD) { - // FIXME: It would be better if there was a way to explicitly compute the - // record layout instead of converting to a type. - Types.ConvertTagDeclType(RD); - - return Types.getCGRecordLayout(RD); -} - void CGRecordLayoutBuilder::CheckZeroInitializable(QualType T) { // This record already contains a member pointer. if (!IsZeroInitializable) @@ -723,7 +711,7 @@ void CGRecordLayoutBuilder::CheckZeroInitializable(const CXXRecordDecl *RD) { if (!IsZeroInitializable) return; - const CGRecordLayout &Layout = getCGRecordLayout(RD); + const CGRecordLayout &Layout = Types.getCGRecordLayout(RD); if (!Layout.isZeroInitializable()) IsZeroInitializable = false; } diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp index ea7d18f0ca..fb1a6d8f13 100644 --- a/lib/CodeGen/CodeGenTypes.cpp +++ b/lib/CodeGen/CodeGenTypes.cpp @@ -524,11 +524,5 @@ bool CodeGenTypes::isZeroInitializable(QualType T) { } bool CodeGenTypes::isZeroInitializable(const CXXRecordDecl *RD) { - - // FIXME: It would be better if there was a way to explicitly compute the - // record layout instead of converting to a type. - ConvertTagDeclType(RD); - - const CGRecordLayout &Layout = getCGRecordLayout(RD); - return Layout.isZeroInitializable(); + return getCGRecordLayout(RD).isZeroInitializable(); } -- 2.40.0