Switch to the C++11 implementation (NFC)

Author: adrian-prantl

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -12,12 +12,6 @@
 
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
 
-// C++ Includes
-#include <mutex> // std::once
-#include <queue>
-#include <set>
-#include <sstream>
-
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/ASTDemangler.h"
 #include "swift/AST/ASTMangler.h"
@@ -130,6 +124,12 @@
 #include "Plugins/SymbolFile/DWARF/DWARFASTParserClang.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 
+#include <mutex>
+#include <queue>
+#include <regex>
+#include <set>
+#include <sstream>
+
 namespace {
 
 /// Used to sort the log output.
@@ -1145,11 +1145,6 @@ std::string SwiftASTContext::GetResourceDir(StringRef platform_sdk_path,
   {
     FileSpec faux_swift_dir_spec(swift_dir);
     if (faux_swift_dir_spec) {
-// We can't use a C++11 stdlib regex feature here because it doesn't
-// work on Ubuntu 14.04 x86_64.  Once we don't care about supporting
-// that anymore, let's pull the code below back in since it is a
-// simpler implementation using std::regex.
-#if 0
       // Let's try to regex this.
       // We're looking for /some/path/lldb-{os}-{arch}, and want to
       // build the following:
@@ -1168,43 +1163,17 @@ std::string SwiftASTContext::GetResourceDir(StringRef platform_sdk_path,
       const std::string build_tree_resource_dir =
           std::regex_replace(faux_swift_dir, match_regex,
                              replace_format);
-#else
-      std::string build_tree_resource_dir;
-      const std::string faux_swift_dir = faux_swift_dir_spec.GetCString();
-
-      // Find something that matches lldb- (particularly,
-      // the last one).
-      const std::string lldb_dash("lldb-");
-      auto lldb_pos = faux_swift_dir.rfind(lldb_dash);
-      if ((lldb_pos != std::string::npos) && (lldb_pos > 0) &&
-          ((faux_swift_dir[lldb_pos - 1] == '\\') ||
-           (faux_swift_dir[lldb_pos - 1] == '/'))) {
-        // We found something that matches ^.+[/\\]lldb-.+$
-        std::ostringstream stream;
-        // Take everything before lldb- (the path leading up to
-        // the lldb dir).
-        stream << faux_swift_dir.substr(0, lldb_pos);
-
-        // replace lldb- with swift-.
-        stream << "swift-";
-
-        // and now tack on the same components from after
-        // the lldb- part.
-        stream << faux_swift_dir.substr(lldb_pos + lldb_dash.length());
-        const std::string build_tree_resource_dir = stream.str();
+      LOG_PRINTF(GetLog(LLDBLog::Types),
+                 "trying ePathTypeSwiftDir regex-based build dir: %s",
+                 build_tree_resource_dir.c_str());
+      FileSpec swift_resource_dir_spec(build_tree_resource_dir.c_str());
+      if (IsDirectory(swift_resource_dir_spec)) {
         LOG_PRINTF(GetLog(LLDBLog::Types),
-                   "trying ePathTypeSwiftDir regex-based build dir: %s",
-                   build_tree_resource_dir.c_str());
-        FileSpec swift_resource_dir_spec(build_tree_resource_dir.c_str());
-        if (IsDirectory(swift_resource_dir_spec)) {
-          LOG_PRINTF(GetLog(LLDBLog::Types),
-                     "found Swift resource dir via "
-                     "ePathTypeSwiftDir + inferred build-tree dir: %s",
-                     swift_resource_dir_spec.GetCString());
-          return swift_resource_dir_spec.GetCString();
-        }
+                   "found Swift resource dir via "
+                   "ePathTypeSwiftDir + inferred build-tree dir: %s",
+                   swift_resource_dir_spec.GetCString());
+        return swift_resource_dir_spec.GetCString();
       }
-#endif
     }
   }