Minor style fixes from review.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@31685 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/Linker.h b/include/llvm/Linker.h
index 5a19ec6..460cad4 100644
--- a/include/llvm/Linker.h
+++ b/include/llvm/Linker.h
@@ -241,7 +241,9 @@
bool LinkInModule(
Module* Src, ///< Module linked into \p Dest
std::string* ErrorMsg = 0 /// Error/diagnostic string
- ) { return LinkModules(Composite, Src, ErrorMsg ); }
+ ) {
+ return LinkModules(Composite, Src, ErrorMsg );
+ }
/// This is the heart of the linker. This method will take unconditional
/// control of the \p Src module and link it into the \p Dest module. The
diff --git a/tools/bugpoint/Miscompilation.cpp b/tools/bugpoint/Miscompilation.cpp
index 116e3a5..c5eaa07 100644
--- a/tools/bugpoint/Miscompilation.cpp
+++ b/tools/bugpoint/Miscompilation.cpp
@@ -518,9 +518,8 @@
// See if we can rip any loops out of the miscompiled functions and still
// trigger the problem.
- if (!DisableLoopExtraction)
- if (!BugpointIsInterrupted &&
- ExtractLoops(BD, TestFn, MiscompiledFunctions)) {
+ if (!BugpointIsInterrupted && !DisableLoopExtraction &&
+ ExtractLoops(BD, TestFn, MiscompiledFunctions)) {
// Okay, we extracted some loops and the problem still appears. See if we
// can eliminate some of the created functions from being candidates.
diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp
index d96494a..82cf674 100644
--- a/tools/llvm-ld/llvm-ld.cpp
+++ b/tools/llvm-ld/llvm-ld.cpp
@@ -326,10 +326,10 @@
for (unsigned index = 0; index < LinkItems.size(); index++)
if (LinkItems[index].first != "crtend") {
if (LinkItems[index].second) {
- std::string lib_name = "-l" + LinkItems[index].first;
- args.push_back(lib_name.c_str());
+ std::string lib_name = "-l" + LinkItems[index].first;
+ args.push_back(lib_name.c_str());
} else
- args.push_back(LinkItems[index].first.c_str());
+ args.push_back(LinkItems[index].first.c_str());
}
args.push_back(0);