[lldb][NFC] Migrate FileSpec::Dump to raw_ostream

Teemperor · Teemperor · commit 4dac97eb1e65 · 2019-12-06T09:40:42.000+01:00
diff --git a/lldb/include/lldb/Utility/FileSpec.h b/lldb/include/lldb/Utility/FileSpec.h
@@ -211,7 +211,7 @@ class FileSpec {
   ///
   /// \param[in] s
   ///     The stream to which to dump the object description.
-  void Dump(Stream *s) const;
+  void Dump(llvm::raw_ostream &s) const;
 
   Style GetPathStyle() const;
 
diff --git a/lldb/source/Breakpoint/BreakpointLocation.cpp b/lldb/source/Breakpoint/BreakpointLocation.cpp
@@ -519,7 +519,7 @@ void BreakpointLocation::GetDescription(Stream *s,
       if (sc.module_sp) {
         s->EOL();
         s->Indent("module = ");
-        sc.module_sp->GetFileSpec().Dump(s);
+        sc.module_sp->GetFileSpec().Dump(s->AsRawOstream());
       }
 
       if (sc.comp_unit != nullptr) {
diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp
@@ -1349,7 +1349,7 @@ static void DumpFullpath(Stream &strm, const FileSpec *file_spec_ptr,
       strm.Printf("%-*s", width, fullpath.c_str());
       return;
     } else {
-      file_spec_ptr->Dump(&strm);
+      file_spec_ptr->Dump(strm.AsRawOstream());
       return;
     }
   }
diff --git a/lldb/source/Core/FileSpecList.cpp b/lldb/source/Core/FileSpecList.cpp
@@ -47,7 +47,7 @@ void FileSpecList::Clear() { m_files.clear(); }
 void FileSpecList::Dump(Stream *s, const char *separator_cstr) const {
   collection::const_iterator pos, end = m_files.end();
   for (pos = m_files.begin(); pos != end; ++pos) {
-    pos->Dump(s);
+    pos->Dump(s->AsRawOstream());
     if (separator_cstr && ((pos + 1) != end))
       s->PutCString(separator_cstr);
   }
diff --git a/lldb/source/Core/FormatEntity.cpp b/lldb/source/Core/FormatEntity.cpp
@@ -2310,7 +2310,7 @@ bool FormatEntity::FormatFileSpec(const FileSpec &file_spec, Stream &s,
                                   llvm::StringRef variable_name,
                                   llvm::StringRef variable_format) {
   if (variable_name.empty() || variable_name.equals(".fullpath")) {
-    file_spec.Dump(&s);
+    file_spec.Dump(s.AsRawOstream());
     return true;
   } else if (variable_name.equals(".basename")) {
     s.PutCString(file_spec.GetFilename().AsCString(""));
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
@@ -1511,7 +1511,7 @@ bool Module::LoadScriptingResourceInTarget(Target *target, Status &error,
               return false;
             }
             StreamString scripting_stream;
-            scripting_fspec.Dump(&scripting_stream);
+            scripting_fspec.Dump(scripting_stream.AsRawOstream());
             const bool can_reload = true;
             const bool init_lldb_globals = false;
             bool did_load = script_interpreter->LoadScriptingModule(
diff --git a/lldb/source/Interpreter/OptionValueFileSpecList.cpp b/lldb/source/Interpreter/OptionValueFileSpecList.cpp
@@ -33,7 +33,7 @@ void OptionValueFileSpecList::DumpValue(const ExecutionContext *exe_ctx,
         strm.Indent();
         strm.Printf("[%u]: ", i);
       }
-      m_current_value.GetFileSpecAtIndex(i).Dump(&strm);
+      m_current_value.GetFileSpecAtIndex(i).Dump(strm.AsRawOstream());
       if (one_line)
         strm << ' ';
     }
diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
@@ -3891,7 +3891,7 @@ void RSModuleDescriptor::Dump(Stream &strm) const {
   int indent = strm.GetIndentLevel();
 
   strm.Indent();
-  m_module->GetFileSpec().Dump(&strm);
+  m_module->GetFileSpec().Dump(strm.AsRawOstream());
   strm.Indent(m_module->GetNumCompileUnits() ? "Debug info loaded."
                                              : "Debug info does not exist.");
   strm.EOL();
diff --git a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
@@ -42,7 +42,7 @@ static bool UUIDsMatch(Module *module, ObjectFile *ofile,
       if (feedback_strm) {
         feedback_strm->PutCString(
             "warning: failed to get the uuid for object file: '");
-        ofile->GetFileSpec().Dump(feedback_strm);
+        ofile->GetFileSpec().Dump(feedback_strm->AsRawOstream());
         feedback_strm->PutCString("\n");
       }
       return false;
@@ -57,11 +57,11 @@ static bool UUIDsMatch(Module *module, ObjectFile *ofile,
           "warning: UUID mismatch detected between modules:\n    ");
       module->GetUUID().Dump(feedback_strm);
       feedback_strm->PutChar(' ');
-      module->GetFileSpec().Dump(feedback_strm);
+      module->GetFileSpec().Dump(feedback_strm->AsRawOstream());
       feedback_strm->PutCString("\n    ");
       dsym_uuid.Dump(feedback_strm);
       feedback_strm->PutChar(' ');
-      ofile->GetFileSpec().Dump(feedback_strm);
+      ofile->GetFileSpec().Dump(feedback_strm->AsRawOstream());
       feedback_strm->EOL();
     }
   }
diff --git a/lldb/source/Symbol/LineEntry.cpp b/lldb/source/Symbol/LineEntry.cpp
@@ -51,7 +51,7 @@ bool LineEntry::IsValid() const {
 bool LineEntry::DumpStopContext(Stream *s, bool show_fullpaths) const {
   if (file) {
     if (show_fullpaths)
-      file.Dump(s);
+      file.Dump(s->AsRawOstream());
     else
       file.GetFilename().Dump(s);
 
diff --git a/lldb/source/Symbol/SymbolContext.cpp b/lldb/source/Symbol/SymbolContext.cpp
@@ -184,7 +184,7 @@ void SymbolContext::GetDescription(Stream *s, lldb::DescriptionLevel level,
                                    Target *target) const {
   if (module_sp) {
     s->Indent("     Module: file = \"");
-    module_sp->GetFileSpec().Dump(s);
+    module_sp->GetFileSpec().Dump(s->AsRawOstream());
     *s << '"';
     if (module_sp->GetArchitecture().IsValid())
       s->Printf(", arch = \"%s\"",
@@ -310,7 +310,7 @@ void SymbolContext::Dump(Stream *s, Target *target) const {
   s->Indent();
   *s << "Module       = " << module_sp.get() << ' ';
   if (module_sp)
-    module_sp->GetFileSpec().Dump(s);
+    module_sp->GetFileSpec().Dump(s->AsRawOstream());
   s->EOL();
   s->Indent();
   *s << "CompileUnit  = " << comp_unit;
diff --git a/lldb/source/Utility/FileSpec.cpp b/lldb/source/Utility/FileSpec.cpp
@@ -252,7 +252,7 @@ bool FileSpec::operator<(const FileSpec &rhs) const {
 
 // Dump a FileSpec object to a stream
 Stream &lldb_private::operator<<(Stream &s, const FileSpec &f) {
-  f.Dump(&s);
+  f.Dump(s.AsRawOstream());
   return s;
 }
 
@@ -321,14 +321,12 @@ llvm::Optional<FileSpec::Style> FileSpec::GuessPathStyle(llvm::StringRef absolut
 // Dump the object to the supplied stream. If the object contains a valid
 // directory name, it will be displayed followed by a directory delimiter, and
 // the filename.
-void FileSpec::Dump(Stream *s) const {
-  if (s) {
-    std::string path{GetPath(true)};
-    s->PutCString(path);
-    char path_separator = GetPreferredPathSeparator(m_style);
-    if (!m_filename && !path.empty() && path.back() != path_separator)
-      s->PutChar(path_separator);
-  }
+void FileSpec::Dump(llvm::raw_ostream &s) const {
+  std::string path{GetPath(true)};
+  s << path;
+  char path_separator = GetPreferredPathSeparator(m_style);
+  if (!m_filename && !path.empty() && path.back() != path_separator)
+    s << path_separator;
 }
 
 FileSpec::Style FileSpec::GetPathStyle() const { return m_style; }
diff --git a/lldb/source/Utility/ProcessInfo.cpp b/lldb/source/Utility/ProcessInfo.cpp
@@ -119,7 +119,7 @@ void ProcessInstanceInfo::Dump(Stream &s, UserIDResolver &resolver) const {
   if (m_executable) {
     s.Printf("   name = %s\n", m_executable.GetFilename().GetCString());
     s.PutCString("   file = ");
-    m_executable.Dump(&s);
+    m_executable.Dump(s.AsRawOstream());
     s.EOL();
   }
   const uint32_t argc = m_arguments.GetArgumentCount();

Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ void BreakpointLocation::GetDescription(Stream *s,`
`519`	`519`	`if (sc.module_sp) {`
`520`	`520`	`s->EOL();`
`521`	`521`	`s->Indent("module = ");`
`522`		`- sc.module_sp->GetFileSpec().Dump(s);`
	`522`	`+ sc.module_sp->GetFileSpec().Dump(s->AsRawOstream());`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`if (sc.comp_unit != nullptr) {`
Original file line number	Diff line number	Diff line change
`@@ -1349,7 +1349,7 @@ static void DumpFullpath(Stream &strm, const FileSpec *file_spec_ptr,`
`1349`	`1349`	`strm.Printf("%-*s", width, fullpath.c_str());`
`1350`	`1350`	`return;`
`1351`	`1351`	`} else {`
`1352`		`- file_spec_ptr->Dump(&strm);`
	`1352`	`+ file_spec_ptr->Dump(strm.AsRawOstream());`
`1353`	`1353`	`return;`
`1354`	`1354`	`}`
`1355`	`1355`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void FileSpecList::Clear() { m_files.clear(); }`
`47`	`47`	`void FileSpecList::Dump(Stream s, const char separator_cstr) const {`
`48`	`48`	`collection::const_iterator pos, end = m_files.end();`
`49`	`49`	`for (pos = m_files.begin(); pos != end; ++pos) {`
`50`		`- pos->Dump(s);`
	`50`	`+ pos->Dump(s->AsRawOstream());`
`51`	`51`	`if (separator_cstr && ((pos + 1) != end))`
`52`	`52`	`s->PutCString(separator_cstr);`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1511,7 +1511,7 @@ bool Module::LoadScriptingResourceInTarget(Target *target, Status &error,`
`1511`	`1511`	`return false;`
`1512`	`1512`	`}`
`1513`	`1513`	`StreamString scripting_stream;`
`1514`		`- scripting_fspec.Dump(&scripting_stream);`
	`1514`	`+ scripting_fspec.Dump(scripting_stream.AsRawOstream());`
`1515`	`1515`	`const bool can_reload = true;`
`1516`	`1516`	`const bool init_lldb_globals = false;`
`1517`	`1517`	`bool did_load = script_interpreter->LoadScriptingModule(`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ void OptionValueFileSpecList::DumpValue(const ExecutionContext *exe_ctx,`
`33`	`33`	`strm.Indent();`
`34`	`34`	`strm.Printf("[%u]: ", i);`
`35`	`35`	`}`
`36`		`- m_current_value.GetFileSpecAtIndex(i).Dump(&strm);`
	`36`	`+ m_current_value.GetFileSpecAtIndex(i).Dump(strm.AsRawOstream());`
`37`	`37`	`if (one_line)`
`38`	`38`	`strm << ' ';`
`39`	`39`	`}`