Revert r120110. We don't want to call ConvertType from within getCGRecordLayout.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@120112 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp
index 296837baf84adc5e621016ad8e9b9c7037bbf505..fdfdd9895b8d1c5091a1dca6c04cda604070f7bf 100644 (file)
--- a/lib/CodeGen/CodeGenTypes.cpp
+++ b/lib/CodeGen/CodeGenTypes.cpp
@@ -483,17 +483,15 @@ const llvm::Type *CodeGenTypes::ConvertTagDeclType(const TagDecl *TD) {
   return ResultHolder.get();
 }
 
-/// getCGRecordLayout - Return record layout info for the given llvm::Type.
+/// getCGRecordLayout - Return record layout info for the given record decl.
 const CGRecordLayout &
-CodeGenTypes::getCGRecordLayout(const RecordDecl *TD) {
-  QualType T = Context.getTagDeclType(TD);
-  const Type *Key = T.getTypePtr();
+CodeGenTypes::getCGRecordLayout(const RecordDecl *RD) {
+  const Type *Key = Context.getTagDeclType(RD).getTypePtr();
 
   const CGRecordLayout *Layout = CGRecordLayouts.lookup(Key);
   if (!Layout) {
-    // Compute the type information. We use ConvertType here so that we'll
-    // get a name for the type.
-    ConvertType(T);
+    // Compute the type information.
+    ConvertTagDeclType(RD);
 
     // Now try again.
     Layout = CGRecordLayouts.lookup(Key);