Author: Raphael Isemann Date: 2019-12-06T09:40:42+01:00 New Revision: 4dac97eb1e6563750e682e482e68f29ac076a4f7
URL: https://github.com/llvm/llvm-project/commit/4dac97eb1e6563750e682e482e68f29ac076a4f7 DIFF: https://github.com/llvm/llvm-project/commit/4dac97eb1e6563750e682e482e68f29ac076a4f7.diff LOG: [lldb][NFC] Migrate FileSpec::Dump to raw_ostream Added: Modified: lldb/include/lldb/Utility/FileSpec.h lldb/source/Breakpoint/BreakpointLocation.cpp lldb/source/Commands/CommandObjectTarget.cpp lldb/source/Core/FileSpecList.cpp lldb/source/Core/FormatEntity.cpp lldb/source/Core/Module.cpp lldb/source/Interpreter/OptionValueFileSpecList.cpp lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp lldb/source/Symbol/LineEntry.cpp lldb/source/Symbol/SymbolContext.cpp lldb/source/Utility/FileSpec.cpp lldb/source/Utility/ProcessInfo.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Utility/FileSpec.h b/lldb/include/lldb/Utility/FileSpec.h index 61b6209bb3c0..533426671cc6 100644 --- 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 index e6d7d85f9060..7f08b08c6055 100644 --- 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 index ac3188740234..345c325563f0 100644 --- 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 index 95133faf7502..6651324fa362 100644 --- 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 index 81ad6d127f04..beab026e67aa 100644 --- 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 index cc4eea674170..5bb6a55457dd 100644 --- 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 index 1a9d3c9ecb87..f2367b1941c9 100644 --- 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 index e612e15ee789..4edb8dec6082 100644 --- 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 index 857f4f05b839..bb37d777906c 100644 --- 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 index 959a3274ec92..bb3828fef784 100644 --- 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 index b77c011f8cb8..9eb805976f95 100644 --- 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 index a9e542991f17..5c216d947f75 100644 --- 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 index a02ee1af867a..b159e2641973 100644 --- 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(); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
