diff options
| -rw-r--r-- | include/llvm/Module.h | 3 | ||||
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 4 | ||||
| -rw-r--r-- | lib/VMCore/Module.cpp | 13 |
3 files changed, 12 insertions, 8 deletions
diff --git a/include/llvm/Module.h b/include/llvm/Module.h index b9c98814f1..570b1bc7b4 100644 --- a/include/llvm/Module.h +++ b/include/llvm/Module.h @@ -303,7 +303,8 @@ public: /// findUsedStructTypes - Walk the entire module and find all of the /// struct types that are in use, returning them in a vector. - void findUsedStructTypes(std::vector<StructType*> &StructTypes) const; + void findUsedStructTypes(std::vector<StructType*> &StructTypes, + bool OnlyNamed = false) const; /// getTypeByName - Return the type with the specified name, or null if there /// is none by that name. diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 765fcc8823..630289b2bd 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -595,12 +595,12 @@ void ModuleLinker::computeTypeMapping() { // example. When the source module got loaded into the same LLVMContext, if // it had the same type, it would have been renamed to "%foo.42 = { i32 }". std::vector<StructType*> SrcStructTypes; - SrcM->findUsedStructTypes(SrcStructTypes); + SrcM->findUsedStructTypes(SrcStructTypes, true); SmallPtrSet<StructType*, 32> SrcStructTypesSet(SrcStructTypes.begin(), SrcStructTypes.end()); std::vector<StructType*> DstStructTypes; - DstM->findUsedStructTypes(DstStructTypes); + DstM->findUsedStructTypes(DstStructTypes, true); SmallPtrSet<StructType*, 32> DstStructTypesSet(DstStructTypes.begin(), DstStructTypes.end()); diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp index 3c67191e09..24c2707b54 100644 --- a/lib/VMCore/Module.cpp +++ b/lib/VMCore/Module.cpp @@ -483,9 +483,10 @@ namespace { DenseSet<Type*> VisitedTypes; std::vector<StructType*> &StructTypes; + bool OnlyNamed; public: - TypeFinder(std::vector<StructType*> &structTypes) - : StructTypes(structTypes) {} + TypeFinder(std::vector<StructType*> &structTypes, bool onlyNamed) + : StructTypes(structTypes), OnlyNamed(onlyNamed) {} void run(const Module &M) { // Get types from global variables. @@ -545,7 +546,8 @@ namespace { // If this is a structure or opaque type, add a name for the type. if (StructType *STy = dyn_cast<StructType>(Ty)) - StructTypes.push_back(STy); + if (!OnlyNamed || STy->hasName()) + StructTypes.push_back(STy); // Recursively walk all contained types. for (Type::subtype_iterator I = Ty->subtype_begin(), @@ -590,6 +592,7 @@ namespace { }; } // end anonymous namespace -void Module::findUsedStructTypes(std::vector<StructType*> &StructTypes) const { - TypeFinder(StructTypes).run(*this); +void Module::findUsedStructTypes(std::vector<StructType*> &StructTypes, + bool OnlyNamed) const { + TypeFinder(StructTypes, OnlyNamed).run(*this); } |