maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Implement Linker::LinkModules with Linker::linkInModule. 

Flipping which one is the implementation will let us optimize linkInModule.

llvm-svn: 181102
This commit is contained in:
Rafael Espindola 2013-05-04 04:08:02 +00:00
parent 17fbf6edc2
commit 287f18b4b8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
llvm/lib/Linker/LinkModules.cpp
View File

@ -1287,7 +1287,13 @@ Linker::~Linker() {
}
bool Linker::linkInModule(Module *Src, unsigned Mode, std::string *ErrorMsg) {
return LinkModules(Composite, Src, Linker::DestroySource, ErrorMsg);
ModuleLinker TheLinker(Composite, Src, Mode);
if (TheLinker.run()) {
if (ErrorMsg)
*ErrorMsg = TheLinker.ErrorMsg;
return true;
}
return false;
}
//===----------------------------------------------------------------------===//
@ -1301,13 +1307,8 @@ bool Linker::linkInModule(Module *Src, unsigned Mode, std::string *ErrorMsg) {
/// and shouldn't be relied on to be consistent.
bool Linker::LinkModules(Module *Dest, Module *Src, unsigned Mode,
std::string *ErrorMsg) {
ModuleLinker TheLinker(Dest, Src, Mode);
if (TheLinker.run()) {
if (ErrorMsg) *ErrorMsg = TheLinker.ErrorMsg;
return true;
}
return false;
Linker L(Dest);
return L.linkInModule(Src, Mode, ErrorMsg);
}
//===----------------------------------------------------------------------===//