now that ConvertTagDeclType is nice and simple, use it from UpdateCompletedType.

llvm-svn: 46809

2 files changed, 7 insertions, 10 deletions

diff --git a/clang/CodeGen/CodeGenTypes.cpp b/clang/CodeGen/CodeGenTypes.cpp
index 24a18334cd2..3f5449056a7 100644
--- a/clang/CodeGen/CodeGenTypes.cpp
+++ b/clang/CodeGen/CodeGenTypes.cpp
@@ -139,13 +139,11 @@ void CodeGenTypes::UpdateCompletedType(const TagDecl *TD) {
   // Remove it from TagDeclTypes so that it will be regenerated.
   TagDeclTypes.erase(TDTI);
 
-  QualType NewTy = Context.getTagDeclType(const_cast<TagDecl*>(TD));
-  const llvm::Type *NT = ConvertNewType(NewTy);
+  // Generate the new type.
+  const llvm::Type *NT = ConvertTagDeclType(TD);
 
-  // If getting the type didn't itself refine it, refine it to its actual type
-  // now.
-  if (llvm::OpaqueType *OT = dyn_cast<llvm::OpaqueType>(OpaqueHolder.get()))
-    OT->refineAbstractTypeTo(NT);
+  // Refine the old opaque type to its new definition.
+  cast<llvm::OpaqueType>(OpaqueHolder.get())->refineAbstractTypeTo(NT);
 }
 
 
@@ -279,7 +277,7 @@ const llvm::Type *CodeGenTypes::ConvertNewType(QualType T) {
 
   case Type::Tagged: {
     const TagDecl *TD = cast<TagType>(Ty).getDecl();
-    const llvm::Type *Res = ConvertTagDeclType(T, TD);
+    const llvm::Type *Res = ConvertTagDeclType(TD);
     
     std::string TypeName(TD->getKindName());
     TypeName += '.';
@@ -316,8 +314,7 @@ void CodeGenTypes::DecodeArgumentTypes(const FunctionTypeProto &FTP,
 
 /// ConvertTagDeclType - Lay out a tagged decl type like struct or union or
 /// enum.
-const llvm::Type *CodeGenTypes::ConvertTagDeclType(QualType T,
-                                                   const TagDecl *TD) {
+const llvm::Type *CodeGenTypes::ConvertTagDeclType(const TagDecl *TD) {
   llvm::DenseMap<const TagDecl*, llvm::PATypeHolder>::iterator TDTI = 
     TagDeclTypes.find(TD);
   
diff --git a/clang/CodeGen/CodeGenTypes.h b/clang/CodeGen/CodeGenTypes.h
index e68d97b1d7f..96187d81d6d 100644
--- a/clang/CodeGen/CodeGenTypes.h
+++ b/clang/CodeGen/CodeGenTypes.h
@@ -156,7 +156,7 @@ public:  // These are internal details of CGT that shouldn't be used externally.
 
   /// ConvertTagDeclType - Lay out a tagged decl type like struct or union or
   /// enum.
-  const llvm::Type *ConvertTagDeclType(QualType T, const TagDecl *TD);
+  const llvm::Type *ConvertTagDeclType(const TagDecl *TD);
 };
 
 }  // end namespace CodeGen