make APIs use std::string instead of std::wstring

Author: charles-zablit

lldb/include/lldb/Target/StackFrame.h

@@ -354,7 +354,7 @@ class StackFrame : public ExecutionContextScope,
   /// \param [in] frame_marker
   ///   Optional string that will be prepended to the frame output description.
   void DumpUsingSettingsFormat(Stream *strm, bool show_unique = false,
-                               const std::wstring &frame_marker = L"");
+                               const std::string &frame_marker = "");
 
   /// Print a description for this frame using a default format.
   ///
@@ -391,7 +391,7 @@ class StackFrame : public ExecutionContextScope,
   ///   Returns true if successful.
   bool GetStatus(Stream &strm, bool show_frame_info, bool show_source,
                  bool show_unique = false,
-                 const std::wstring &frame_marker = L"");
+                 const std::string &frame_marker = "");
 
   /// Query whether this frame is a concrete frame on the call stack, or if it
   /// is an inlined frame derived from the debug information and presented by

lldb/source/Target/StackFrame.cpp

@@ -37,7 +37,6 @@
 #include "lldb/ValueObject/ValueObjectConstResult.h"
 #include "lldb/ValueObject/ValueObjectMemory.h"
 #include "lldb/ValueObject/ValueObjectVariable.h"
-#include "llvm/Support/ConvertUTF.h"
 
 #include "lldb/lldb-enumerations.h"
 
@@ -1936,7 +1935,7 @@ bool StackFrame::DumpUsingFormat(Stream &strm,
 }
 
 void StackFrame::DumpUsingSettingsFormat(Stream *strm, bool show_unique,
-                                         const std::wstring &frame_marker) {
+                                         const std::string &frame_marker) {
   if (strm == nullptr)
     return;
 
@@ -1955,9 +1954,7 @@ void StackFrame::DumpUsingSettingsFormat(Stream *strm, bool show_unique,
     }
   }
 
-  std::string frame_marker_utf8;
-  llvm::convertWideToUTF8(frame_marker, frame_marker_utf8);
-  if (!DumpUsingFormat(*strm, frame_format, frame_marker_utf8)) {
+  if (!DumpUsingFormat(*strm, frame_format, frame_marker)) {
     Dump(strm, true, false);
     strm->EOL();
   }
@@ -2038,7 +2035,7 @@ bool StackFrame::HasCachedData() const {
 }
 
 bool StackFrame::GetStatus(Stream &strm, bool show_frame_info, bool show_source,
-                           bool show_unique, const std::wstring &frame_marker) {
+                           bool show_unique, const std::string &frame_marker) {
   if (show_frame_info) {
     strm.Indent();
     DumpUsingSettingsFormat(&strm, show_unique, frame_marker);

lldb/source/Target/StackFrameList.cpp

@@ -27,6 +27,7 @@
 #include "lldb/Utility/LLDBLog.h"
 #include "lldb/Utility/Log.h"
 #include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/Support/ConvertUTF.h"
 
 #include <memory>
 
@@ -958,9 +959,11 @@ size_t StackFrameList::GetStatus(Stream &strm, uint32_t first_frame,
             m_thread.GetID(), num_frames_displayed))
       break;
 
+    std::string marker_utf8;
+    llvm::convertWideToUTF8(marker, marker_utf8);
     if (!frame_sp->GetStatus(strm, show_frame_info,
                              num_frames_with_source > (first_frame - frame_idx),
-                             show_unique, marker))
+                             show_unique, marker_utf8))
       break;
     ++num_frames_displayed;
   }