llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lto Author: Jay Foad (jayfoad) <details> <summary>Changes</summary> This falls out naturally after inlining finishType into its only remaining use. --- Full diff: https://github.com/llvm/llvm-project/pull/116653.diff 1 Files Affected: - (modified) llvm/lib/Linker/IRMover.cpp (+11-18) ``````````diff diff --git a/llvm/lib/Linker/IRMover.cpp b/llvm/lib/Linker/IRMover.cpp index c653900c632cc9..4bb0ddf891744b 100644 --- a/llvm/lib/Linker/IRMover.cpp +++ b/llvm/lib/Linker/IRMover.cpp @@ -82,8 +82,6 @@ class TypeMapTy : public ValueMapTypeRemapper { Type *get(Type *SrcTy); Type *get(Type *SrcTy, SmallPtrSet<StructType *, 8> &Visited); - void finishType(StructType *DTy, StructType *STy, ArrayRef<Type *> ETypes); - FunctionType *get(FunctionType *T) { return cast<FunctionType>(get((Type *)T)); } @@ -233,20 +231,6 @@ Error TypeMapTy::linkDefinedTypeBodies() { return Error::success(); } -void TypeMapTy::finishType(StructType *DTy, StructType *STy, - ArrayRef<Type *> ETypes) { - DTy->setBody(ETypes, STy->isPacked()); - - // Steal STy's name. - if (STy->hasName()) { - SmallString<16> TmpName = STy->getName(); - STy->setName(""); - DTy->setName(TmpName); - } - - DstStructTypesSet.addNonOpaque(DTy); -} - Type *TypeMapTy::get(Type *Ty) { SmallPtrSet<StructType *, 8> Visited; return get(Ty, Visited); @@ -342,8 +326,17 @@ Type *TypeMapTy::get(Type *Ty, SmallPtrSet<StructType *, 8> &Visited) { return *Entry = Ty; } - StructType *DTy = StructType::create(Ty->getContext()); - finishType(DTy, STy, ElementTypes); + StructType *DTy = + StructType::create(Ty->getContext(), ElementTypes, "", STy->isPacked()); + + // Steal STy's name. + if (STy->hasName()) { + SmallString<16> TmpName = STy->getName(); + STy->setName(""); + DTy->setName(TmpName); + } + + DstStructTypesSet.addNonOpaque(DTy); return *Entry = DTy; } } `````````` </details> https://github.com/llvm/llvm-project/pull/116653 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
