Vendor import of lldb trunk r338150:vendor/lldb/lldb-trunk-r338150

https://llvm.org/svn/llvm-project/lldb/trunk@338150

1 files changed, 10 insertions, 11 deletions

diff --git a/source/Target/ProcessInfo.cpp b/source/Target/ProcessInfo.cpp
index 0d986bc76914..ac0350686706 100644
--- a/source/Target/ProcessInfo.cpp
+++ b/source/Target/ProcessInfo.cpp
@@ -35,7 +35,7 @@ ProcessInfo::ProcessInfo(const char *name, const ArchSpec &arch,
 void ProcessInfo::Clear() {
   m_executable.Clear();
   m_arguments.Clear();
-  m_environment.Clear();
+  m_environment.clear();
   m_uid = UINT32_MAX;
   m_gid = UINT32_MAX;
   m_arch.Clear();
@@ -59,8 +59,7 @@ void ProcessInfo::Dump(Stream &s, Platform *platform) const {
   s << "Arguments:\n";
   m_arguments.Dump(s);
 
-  s << "Environment:\n";
-  m_environment.Dump(s, "env");
+  s.Format("Environment:\n{0}", m_environment);
 }
 
 void ProcessInfo::SetExecutableFile(const FileSpec &exe_file,
@@ -94,11 +93,11 @@ void ProcessInfo::SetArguments(char const **argv,
   if (first_arg_is_executable) {
     const char *first_arg = m_arguments.GetArgumentAtIndex(0);
     if (first_arg) {
-      // Yes the first argument is an executable, set it as the executable
-      // in the launch options. Don't resolve the file path as the path
-      // could be a remote platform path
+      // Yes the first argument is an executable, set it as the executable in
+      // the launch options. Don't resolve the file path as the path could be a
+      // remote platform path
       const bool resolve = false;
-      m_executable.SetFile(first_arg, resolve);
+      m_executable.SetFile(first_arg, resolve, FileSpec::Style::native);
     }
   }
 }
@@ -111,11 +110,11 @@ void ProcessInfo::SetArguments(const Args &args, bool first_arg_is_executable) {
   if (first_arg_is_executable) {
     const char *first_arg = m_arguments.GetArgumentAtIndex(0);
     if (first_arg) {
-      // Yes the first argument is an executable, set it as the executable
-      // in the launch options. Don't resolve the file path as the path
-      // could be a remote platform path
+      // Yes the first argument is an executable, set it as the executable in
+      // the launch options. Don't resolve the file path as the path could be a
+      // remote platform path
       const bool resolve = false;
-      m_executable.SetFile(first_arg, resolve);
+      m_executable.SetFile(first_arg, resolve, FileSpec::Style::native);
     }
   }
 }