Merge commit 'e28f4846296a' from apple/master into swift/master-next

Author: git apple-llvm automerger

lldb/source/Initialization/SystemInitializerCommon.cpp

@@ -80,12 +80,10 @@ llvm::Error SystemInitializerCommon::Initialize() {
     }
     if (llvm::Expected<std::string> cwd =
             loader->LoadBuffer<WorkingDirectoryProvider>()) {
-      cwd->erase(std::remove_if(cwd->begin(), cwd->end(),
-                                [](char c) { return std::iscntrl(c); }),
-                 cwd->end());
+      llvm::StringRef working_dir = llvm::StringRef(*cwd).rtrim();
       if (std::error_code ec = FileSystem::Instance()
                                    .GetVirtualFileSystem()
-                                   ->setCurrentWorkingDirectory(*cwd)) {
+                                   ->setCurrentWorkingDirectory(working_dir)) {
         return llvm::errorCodeToError(ec);
       }
     } else {