Skip to content

[lldb] Use LLDB_LOG_ERROR in ObjectFilePECOFF.cpp (NFC) #126972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 11 additions & 22 deletions lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -861,14 +861,9 @@ ObjectFilePECOFF::AppendFromExportTable(SectionList *sect_list,
for (const auto &entry : m_binary->export_directories()) {
llvm::StringRef sym_name;
if (auto err = entry.getSymbolName(sym_name)) {
if (log)
log->Format(
__FILE__, __func__,
"ObjectFilePECOFF::AppendFromExportTable - failed to get export "
"table entry name: {0}",
llvm::fmt_consume(std::move(err)));
else
llvm::consumeError(std::move(err));
LLDB_LOG_ERROR(log, std::move(err),
"ObjectFilePECOFF::AppendFromExportTable - failed to get "
"export table entry name: {0}");
continue;
}
Symbol symbol;
Expand All @@ -886,13 +881,10 @@ ObjectFilePECOFF::AppendFromExportTable(SectionList *sect_list,
// it in symtab and make a note using the symbol name.
llvm::StringRef forwarder_name;
if (auto err = entry.getForwardTo(forwarder_name)) {
if (log)
log->Format(__FILE__, __func__,
"ObjectFilePECOFF::AppendFromExportTable - failed to get "
"forwarder name of forwarder export '{0}': {1}",
sym_name, llvm::fmt_consume(std::move(err)));
else
llvm::consumeError(std::move(err));
LLDB_LOG_ERROR(log, std::move(err),
"ObjectFilePECOFF::AppendFromExportTable - failed to "
"get forwarder name of forwarder export '{1}': {0}",
sym_name);
continue;
}
llvm::SmallString<256> new_name = {symbol.GetDisplayName().GetStringRef(),
Expand All @@ -904,13 +896,10 @@ ObjectFilePECOFF::AppendFromExportTable(SectionList *sect_list,

uint32_t function_rva;
if (auto err = entry.getExportRVA(function_rva)) {
if (log)
log->Format(__FILE__, __func__,
"ObjectFilePECOFF::AppendFromExportTable - failed to get "
"address of export entry '{0}': {1}",
sym_name, llvm::fmt_consume(std::move(err)));
else
llvm::consumeError(std::move(err));
LLDB_LOG_ERROR(log, std::move(err),
"ObjectFilePECOFF::AppendFromExportTable - failed to get "
"address of export entry '{1}': {0}",
sym_name);
continue;
}
// Skip the symbol if it doesn't look valid.
Expand Down