diff --git a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h --- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h +++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h @@ -20,7 +20,6 @@ #include #include "lldb/Target/PostMortemProcess.h" -#include "lldb/Utility/ConstString.h" #include "lldb/Utility/Status.h" #include "Plugins/ObjectFile/ELF/ELFHeader.h" @@ -117,7 +116,7 @@ lldb::addr_t start; lldb::addr_t end; lldb::addr_t file_ofs; - lldb_private::ConstString path; + std::string path; }; // For ProcessElfCore only diff --git a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp --- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp +++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp @@ -258,8 +258,8 @@ if (!m_nt_file_entries.empty()) { ModuleSpec exe_module_spec; exe_module_spec.GetArchitecture() = arch; - exe_module_spec.GetFileSpec().SetFile( - m_nt_file_entries[0].path.GetCString(), FileSpec::Style::native); + exe_module_spec.GetFileSpec().SetFile(m_nt_file_entries[0].path, + FileSpec::Style::native); if (exe_module_spec.GetFileSpec()) { exe_module_sp = GetTarget().GetOrCreateModule(exe_module_spec, true /* notify */); @@ -938,7 +938,7 @@ for (uint64_t i = 0; i < count; ++i) { const char *path = note.data.GetCStr(&offset); if (path && path[0]) - m_nt_file_entries[i].path.SetCString(path); + m_nt_file_entries[i].path.assign(path); } break; }