Author: Alex Langford Date: 2023-06-26T10:33:18-07:00 New Revision: 718e0cd6e7240a1233991eec472aa904800dce00
URL: https://github.com/llvm/llvm-project/commit/718e0cd6e7240a1233991eec472aa904800dce00 DIFF: https://github.com/llvm/llvm-project/commit/718e0cd6e7240a1233991eec472aa904800dce00.diff LOG: [lldb][NFCI] UUID::Dump should take a reference instead of a pointer We always assume the Stream pointer is valid, might as well be taking a reference instead. Differential Revision: https://reviews.llvm.org/D153710 Added: Modified: lldb/include/lldb/Core/ModuleSpec.h lldb/include/lldb/Utility/UUID.h lldb/source/Commands/CommandObjectTarget.cpp lldb/source/Interpreter/OptionValueUUID.cpp lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp lldb/source/Target/Target.cpp lldb/source/Utility/UUID.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Core/ModuleSpec.h b/lldb/include/lldb/Core/ModuleSpec.h index 451e347c9c7ba..4cbbbfa8a26e1 100644 --- a/lldb/include/lldb/Core/ModuleSpec.h +++ b/lldb/include/lldb/Core/ModuleSpec.h @@ -194,7 +194,7 @@ class ModuleSpec { if (dumped_something) strm.PutCString(", "); strm.PutCString("uuid = "); - m_uuid.Dump(&strm); + m_uuid.Dump(strm); dumped_something = true; } if (m_object_name) { diff --git a/lldb/include/lldb/Utility/UUID.h b/lldb/include/lldb/Utility/UUID.h index 56aa3fa8450b0..66058d482f012 100644 --- a/lldb/include/lldb/Utility/UUID.h +++ b/lldb/include/lldb/Utility/UUID.h @@ -61,7 +61,7 @@ class UUID { void Clear() { m_bytes.clear(); } - void Dump(Stream *s) const; + void Dump(Stream &s) const; llvm::ArrayRef<uint8_t> GetBytes() const { return m_bytes; } diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp index dd4fbe84e5737..300053bcf5ed7 100644 --- a/lldb/source/Commands/CommandObjectTarget.cpp +++ b/lldb/source/Commands/CommandObjectTarget.cpp @@ -1318,7 +1318,7 @@ static void DumpModuleArchitecture(Stream &strm, Module *module, static void DumpModuleUUID(Stream &strm, Module *module) { if (module && module->GetUUID().IsValid()) - module->GetUUID().Dump(&strm); + module->GetUUID().Dump(strm); else strm.PutCString(" "); } @@ -2560,7 +2560,7 @@ class CommandObjectTargetModulesAdd : public CommandObjectParsed { return true; } else { StreamString strm; - module_spec.GetUUID().Dump(&strm); + module_spec.GetUUID().Dump(strm); if (module_spec.GetFileSpec()) { if (module_spec.GetSymbolFileSpec()) { result.AppendErrorWithFormat( @@ -2584,7 +2584,7 @@ class CommandObjectTargetModulesAdd : public CommandObjectParsed { } } else { StreamString strm; - module_spec.GetUUID().Dump(&strm); + module_spec.GetUUID().Dump(strm); result.AppendErrorWithFormat( "Unable to locate the executable or symbol file with UUID %s", strm.GetData()); @@ -4240,7 +4240,7 @@ class CommandObjectTargetSymbolsAdd : public CommandObjectParsed { StreamString ss_symfile_uuid; if (module_spec.GetUUID().IsValid()) { ss_symfile_uuid << " ("; - module_spec.GetUUID().Dump(&ss_symfile_uuid); + module_spec.GetUUID().Dump(ss_symfile_uuid); ss_symfile_uuid << ')'; } result.AppendErrorWithFormat( @@ -4275,7 +4275,7 @@ class CommandObjectTargetSymbolsAdd : public CommandObjectParsed { if (!DownloadObjectAndSymbolFile(module_spec, result, flush)) { StreamString error_strm; error_strm.PutCString("unable to find debug symbols for UUID "); - module_spec.GetUUID().Dump(&error_strm); + module_spec.GetUUID().Dump(error_strm); result.AppendError(error_strm.GetString()); return false; } diff --git a/lldb/source/Interpreter/OptionValueUUID.cpp b/lldb/source/Interpreter/OptionValueUUID.cpp index 283f9c1b67b35..ff35870a76e89 100644 --- a/lldb/source/Interpreter/OptionValueUUID.cpp +++ b/lldb/source/Interpreter/OptionValueUUID.cpp @@ -23,7 +23,7 @@ void OptionValueUUID::DumpValue(const ExecutionContext *exe_ctx, Stream &strm, if (dump_mask & eDumpOptionValue) { if (dump_mask & eDumpOptionType) strm.PutCString(" = "); - m_uuid.Dump(&strm); + m_uuid.Dump(strm); } } diff --git a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp index 0adf204323b39..7a1568f0b26c1 100644 --- a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp +++ b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp @@ -54,11 +54,11 @@ static bool UUIDsMatch(Module *module, ObjectFile *ofile, if (feedback_strm) { feedback_strm->PutCString( "warning: UUID mismatch detected between modules:\n "); - module->GetUUID().Dump(feedback_strm); + module->GetUUID().Dump(*feedback_strm); feedback_strm->PutChar(' '); module->GetFileSpec().Dump(feedback_strm->AsRawOstream()); feedback_strm->PutCString("\n "); - dsym_uuid.Dump(feedback_strm); + dsym_uuid.Dump(*feedback_strm); feedback_strm->PutChar(' '); ofile->GetFileSpec().Dump(feedback_strm->AsRawOstream()); feedback_strm->EOL(); diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index 9f4a18eb68aa2..94317f3c0535c 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -2271,7 +2271,7 @@ ModuleSP Target::GetOrCreateModule(const ModuleSpec &module_spec, bool notify, message << " (uuid "; if (dump_uuid.IsValid()) - dump_uuid.Dump(&message); + dump_uuid.Dump(message); else message << "not specified"; diff --git a/lldb/source/Utility/UUID.cpp b/lldb/source/Utility/UUID.cpp index 62a75ecf47c20..57e3a39d1f8e9 100644 --- a/lldb/source/Utility/UUID.cpp +++ b/lldb/source/Utility/UUID.cpp @@ -61,7 +61,7 @@ std::string UUID::GetAsString(llvm::StringRef separator) const { return result; } -void UUID::Dump(Stream *s) const { s->PutCString(GetAsString()); } +void UUID::Dump(Stream &s) const { s.PutCString(GetAsString()); } static inline int xdigit_to_int(char ch) { ch = tolower(ch); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
