Author: Raphael Isemann Date: 2019-12-04T09:35:50+01:00 New Revision: c4c464f8a5025ad59733723e1ba1900837760078
URL: https://github.com/llvm/llvm-project/commit/c4c464f8a5025ad59733723e1ba1900837760078 DIFF: https://github.com/llvm/llvm-project/commit/c4c464f8a5025ad59733723e1ba1900837760078.diff LOG: [lldb][NFC] Migrate to raw_ostream in Module::GetDescription Added: Modified: lldb/include/lldb/Core/Module.h lldb/source/API/SBModule.cpp lldb/source/Core/Module.cpp lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp lldb/source/Target/Target.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Core/Module.h b/lldb/include/lldb/Core/Module.h index bb6c9bdad760..2af18c83f23a 100644 --- a/lldb/include/lldb/Core/Module.h +++ b/lldb/include/lldb/Core/Module.h @@ -190,7 +190,7 @@ class Module : public std::enable_shared_from_this<Module>, lldb::ModuleSP CalculateSymbolContextModule() override; void - GetDescription(Stream *s, + GetDescription(llvm::raw_ostream &s, lldb::DescriptionLevel level = lldb::eDescriptionLevelFull); /// Get the module path and object name. diff --git a/lldb/source/API/SBModule.cpp b/lldb/source/API/SBModule.cpp index 7ac189bb4273..4e9dfb0c1e62 100644 --- a/lldb/source/API/SBModule.cpp +++ b/lldb/source/API/SBModule.cpp @@ -245,7 +245,7 @@ bool SBModule::GetDescription(SBStream &description) { ModuleSP module_sp(GetSP()); if (module_sp) { - module_sp->GetDescription(&strm); + module_sp->GetDescription(strm.AsRawOstream()); } else strm.PutCString("No value"); diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp index 360c8c134546..a8a92bb5b1fa 100644 --- a/lldb/source/Core/Module.cpp +++ b/lldb/source/Core/Module.cpp @@ -1061,34 +1061,35 @@ std::string Module::GetSpecificationDescription() const { return spec; } -void Module::GetDescription(Stream *s, lldb::DescriptionLevel level) { +void Module::GetDescription(llvm::raw_ostream &s, + lldb::DescriptionLevel level) { std::lock_guard<std::recursive_mutex> guard(m_mutex); if (level >= eDescriptionLevelFull) { if (m_arch.IsValid()) - s->Printf("(%s) ", m_arch.GetArchitectureName()); + s << llvm::formatv("({0}) ", m_arch.GetArchitectureName()); } if (level == eDescriptionLevelBrief) { const char *filename = m_file.GetFilename().GetCString(); if (filename) - s->PutCString(filename); + s << filename; } else { char path[PATH_MAX]; if (m_file.GetPath(path, sizeof(path))) - s->PutCString(path); + s << path; } const char *object_name = m_object_name.GetCString(); if (object_name) - s->Printf("(%s)", object_name); + s << llvm::formatv("({0})", object_name); } void Module::ReportError(const char *format, ...) { if (format && format[0]) { StreamString strm; strm.PutCString("error: "); - GetDescription(&strm, lldb::eDescriptionLevelBrief); + GetDescription(strm.AsRawOstream(), lldb::eDescriptionLevelBrief); strm.PutChar(' '); va_list args; va_start(args, format); @@ -1119,7 +1120,7 @@ void Module::ReportErrorIfModifyDetected(const char *format, ...) { if (format) { StreamString strm; strm.PutCString("error: the object file "); - GetDescription(&strm, lldb::eDescriptionLevelFull); + GetDescription(strm.AsRawOstream(), lldb::eDescriptionLevelFull); strm.PutCString(" has been modified\n"); va_list args; @@ -1145,7 +1146,7 @@ void Module::ReportWarning(const char *format, ...) { if (format && format[0]) { StreamString strm; strm.PutCString("warning: "); - GetDescription(&strm, lldb::eDescriptionLevelFull); + GetDescription(strm.AsRawOstream(), lldb::eDescriptionLevelFull); strm.PutChar(' '); va_list args; @@ -1166,7 +1167,7 @@ void Module::ReportWarning(const char *format, ...) { void Module::LogMessage(Log *log, const char *format, ...) { if (log != nullptr) { StreamString log_message; - GetDescription(&log_message, lldb::eDescriptionLevelFull); + GetDescription(log_message.AsRawOstream(), lldb::eDescriptionLevelFull); log_message.PutCString(": "); va_list args; va_start(args, format); @@ -1179,7 +1180,7 @@ void Module::LogMessage(Log *log, const char *format, ...) { void Module::LogMessageVerboseBacktrace(Log *log, const char *format, ...) { if (log != nullptr) { StreamString log_message; - GetDescription(&log_message, lldb::eDescriptionLevelFull); + GetDescription(log_message.AsRawOstream(), lldb::eDescriptionLevelFull); log_message.PutCString(": "); va_list args; va_start(args, format); diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp index 654585cb35eb..fb8b48cc108b 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -734,7 +734,7 @@ bool DynamicLoaderMacOSXDYLD::InitializeFromAllImageInfos() { if (!module_sp->IsLoadedInTarget(&target)) { if (log) { StreamString s; - module_sp->GetDescription(&s); + module_sp->GetDescription(s.AsRawOstream()); LLDB_LOGF(log, "Unloading pre-run module: %s.", s.GetData()); } not_loaded_modules.Append(module_sp); diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index aeb77b7cf676..ed76e753b17e 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -4094,7 +4094,7 @@ void Target::TargetEventData::Dump(Stream *s) const { if (i != 0) *s << ", "; m_module_list.GetModuleAtIndex(i)->GetDescription( - s, lldb::eDescriptionLevelBrief); + s->AsRawOstream(), lldb::eDescriptionLevelBrief); } } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
