now that ConvertTagDeclType is nice and simple, use it from UpdateCompletedType.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@46809 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CodeGen/CodeGenTypes.cpp b/CodeGen/CodeGenTypes.cpp
index 24a1833..3f54490 100644
--- a/CodeGen/CodeGenTypes.cpp
+++ b/CodeGen/CodeGenTypes.cpp
@@ -139,13 +139,11 @@
// 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 @@
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 @@
/// 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/CodeGen/CodeGenTypes.h b/CodeGen/CodeGenTypes.h
index e68d97b..96187d8 100644
--- a/CodeGen/CodeGenTypes.h
+++ b/CodeGen/CodeGenTypes.h
@@ -156,7 +156,7 @@
/// 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