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 5a19ec6065b157eca8fb72e830f9874104e47f41..460cad493e7bbdcec8fb6381cbcf7705b415d858 100644 (file)
--- a/include/llvm/Linker.h
+++ b/include/llvm/Linker.h
@@ -241,7 +241,9 @@ class Linker {
     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 116e3a53715f4fd3a33b003151d2b782d2b1e243..c5eaa0769ac1960b135c7cfc22822f5f735dd0b4 100644 (file)
--- a/tools/bugpoint/Miscompilation.cpp
+++ b/tools/bugpoint/Miscompilation.cpp
@@ -518,9 +518,8 @@ DebugAMiscompilation(BugDriver &BD,
   // 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 d96494ad330fa6e277dc6e9717bb044a911757e0..82cf674724255fd2d426fe95756c97c62a3d9d2e 100644 (file)
--- a/tools/llvm-ld/llvm-ld.cpp
+++ b/tools/llvm-ld/llvm-ld.cpp
@@ -326,10 +326,10 @@ static int GenerateNative(const std::string &OutputFilename,
   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);