From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Wed, 9 Aug 2017 22:06:32 +0000 (+0000)
Subject: [Path] Sink predicate computations to their uses. NFCI.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5929f4298024bf7b79f7d164d85758b33a5a1306;p=llvm

[Path] Sink predicate computations to their uses. NFCI.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@310531 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Support/Path.cpp b/lib/Support/Path.cpp
index ea59ba62d7b..f30e8a8b0cb 100644
--- a/lib/Support/Path.cpp
+++ b/lib/Support/Path.cpp
@@ -439,10 +439,6 @@ void append(SmallVectorImpl<char> &path, Style style, const Twine &a,
   for (auto &component : components) {
     bool path_has_sep =
         !path.empty() && is_separator(path[path.size() - 1], style);
-    bool component_has_sep =
-        !component.empty() && is_separator(component[0], style);
-    bool is_root_name = has_root_name(component, style);
-
     if (path_has_sep) {
       // Strip separators from beginning of component.
       size_t loc = component.find_first_not_of(separators(style));
@@ -453,7 +449,10 @@ void append(SmallVectorImpl<char> &path, Style style, const Twine &a,
       continue;
     }
 
-    if (!component_has_sep && !(path.empty() || is_root_name)) {
+    bool component_has_sep =
+        !component.empty() && is_separator(component[0], style);
+    if (!component_has_sep &&
+        !(path.empty() || has_root_name(component, style))) {
       // Add a separator.
       path.push_back(preferred_separator(style));
     }