r193419 - Merge two adjacent ifs.

Rafael Espindola rafael.espindola at gmail.com
Fri Oct 25 10:06:04 PDT 2013


Author: rafael
Date: Fri Oct 25 12:06:04 2013
New Revision: 193419

URL: http://llvm.org/viewvc/llvm-project?rev=193419&view=rev
Log:
Merge two adjacent ifs.

Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=193419&r1=193418&r2=193419&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Fri Oct 25 12:06:04 2013
@@ -2426,12 +2426,11 @@ Linux::Linux(const Driver &D, const llvm
 
   // Try walking via the GCC triple path in case of biarch or multiarch GCC
   // installations with strange symlinks.
-  if (GCCInstallation.isValid())
+  if (GCCInstallation.isValid()) {
     addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
                     "/../../" + Multilib, Paths);
 
-  // Add the non-multilib suffixed paths (if potentially different).
-  if (GCCInstallation.isValid()) {
+    // Add the non-multilib suffixed paths (if potentially different).
     const std::string &LibPath = GCCInstallation.getParentLibPath();
     const llvm::Triple &GCCTriple = GCCInstallation.getTriple();
     if (!GCCInstallation.getBiarchSuffix().empty())





More information about the cfe-commits mailing list