diff options
| -rw-r--r-- | llvm/include/llvm/Linker/Linker.h | 8 | ||||
| -rw-r--r-- | llvm/lib/Linker/LinkModules.cpp | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/llvm/include/llvm/Linker/Linker.h b/llvm/include/llvm/Linker/Linker.h index 7c24eef7411..0c7dc910a65 100644 --- a/llvm/include/llvm/Linker/Linker.h +++ b/llvm/include/llvm/Linker/Linker.h @@ -74,15 +74,17 @@ public: Module &getModule() const { return Composite; } /// \brief Link \p Src into the composite. The source is destroyed. + /// /// Passing OverrideSymbols as true will have symbols from Src /// shadow those in the Dest. /// For ThinLTO function importing/exporting the \p FunctionInfoIndex - /// is passed. If a \p FuncToImport is provided, only that single - /// function is imported from the source module. + /// is passed. If \p FunctionsToImport is provided, only the functions that + /// are part of the set will be imported from the source module. + /// /// Returns true on error. bool linkInModule(Module &Src, unsigned Flags = Flags::None, const FunctionInfoIndex *Index = nullptr, - DenseSet<const GlobalValue *> *FuncToImport = nullptr); + DenseSet<const GlobalValue *> *FunctionsToImport = nullptr); static bool linkModules(Module &Dest, Module &Src, DiagnosticHandlerFunction DiagnosticHandler, diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp index 4f740587272..67613967f49 100644 --- a/llvm/lib/Linker/LinkModules.cpp +++ b/llvm/lib/Linker/LinkModules.cpp @@ -424,10 +424,10 @@ public: ModuleLinker(Module &DstM, Linker::IdentifiedStructTypeSet &Set, Module &SrcM, DiagnosticHandlerFunction DiagnosticHandler, unsigned Flags, const FunctionInfoIndex *Index = nullptr, - DenseSet<const GlobalValue *> *FuncToImport = nullptr) + DenseSet<const GlobalValue *> *FunctionsToImport = nullptr) : DstM(DstM), SrcM(SrcM), TypeMap(Set), ValMaterializer(this), DiagnosticHandler(DiagnosticHandler), Flags(Flags), ImportIndex(Index), - ImportFunction(FuncToImport) { + ImportFunction(FunctionsToImport) { assert((ImportIndex || !ImportFunction) && "Expect a FunctionInfoIndex when importing"); // If we have a FunctionInfoIndex but no function to import, @@ -2031,9 +2031,9 @@ Linker::Linker(Module &M) bool Linker::linkInModule(Module &Src, unsigned Flags, const FunctionInfoIndex *Index, - DenseSet<const GlobalValue *> *FuncToImport) { + DenseSet<const GlobalValue *> *FunctionsToImport) { ModuleLinker TheLinker(Composite, IdentifiedStructTypes, Src, - DiagnosticHandler, Flags, Index, FuncToImport); + DiagnosticHandler, Flags, Index, FunctionsToImport); bool RetCode = TheLinker.run(); Composite.dropTriviallyDeadConstantArrays(); return RetCode; |
