aboutsummaryrefslogtreecommitdiff
path: root/lib/Linker/LinkModules.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2008-02-19 18:49:08 +0000
committerChris Lattner <sabre@nondot.org>2008-02-19 18:49:08 +0000
commitf27dfcb210fec571d79bc881f5463e0b405707c0 (patch)
tree85be6b7557219d558c2feb9aaa8e8dd07acb153d /lib/Linker/LinkModules.cpp
parentb476f98ca96d6d46da5cfb866c3ddf8138251f70 (diff)
random cleanups.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47334 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker/LinkModules.cpp')
-rw-r--r--lib/Linker/LinkModules.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index 4a0caada51..a8995d6fb4 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -965,7 +965,7 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) {
}
}
- // COpy the target triple from the source to dest if the dest's is empty
+ // Copy the target triple from the source to dest if the dest's is empty.
if (Dest->getTargetTriple().empty() && !Src->getTargetTriple().empty())
Dest->setTargetTriple(Src->getTargetTriple());
@@ -976,7 +976,7 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) {
Dest->getTargetTriple() != Src->getTargetTriple())
cerr << "WARNING: Linking two modules of different target triples!\n";
- // Append the module inline asm string
+ // Append the module inline asm string.
if (!Src->getModuleInlineAsm().empty()) {
if (Dest->getModuleInlineAsm().empty())
Dest->setModuleInlineAsm(Src->getModuleInlineAsm());
@@ -988,12 +988,9 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) {
// Update the destination module's dependent libraries list with the libraries
// from the source module. There's no opportunity for duplicates here as the
// Module ensures that duplicate insertions are discarded.
- Module::lib_iterator SI = Src->lib_begin();
- Module::lib_iterator SE = Src->lib_end();
- while ( SI != SE ) {
+ for (Module::lib_iterator SI = Src->lib_begin(), SE = Src->lib_end();
+ SI != SE; ++SI)
Dest->addLibrary(*SI);
- ++SI;
- }
// LinkTypes - Go through the symbol table of the Src module and see if any
// types are named in the src module that are not named in the Dst module.