@@ -861,14 +861,9 @@ ObjectFilePECOFF::AppendFromExportTable(SectionList *sect_list,
861861 for (const auto &entry : m_binary->export_directories ()) {
862862 llvm::StringRef sym_name;
863863 if (auto err = entry.getSymbolName (sym_name)) {
864- if (log)
865- log->Format (
866- __FILE__, __func__,
867- " ObjectFilePECOFF::AppendFromExportTable - failed to get export "
868- " table entry name: {0}" ,
869- llvm::fmt_consume (std::move (err)));
870- else
871- llvm::consumeError (std::move (err));
864+ LLDB_LOG_ERROR (log, std::move (err),
865+ " ObjectFilePECOFF::AppendFromExportTable - failed to get "
866+ " export table entry name: {0}" );
872867 continue ;
873868 }
874869 Symbol symbol;
@@ -886,13 +881,10 @@ ObjectFilePECOFF::AppendFromExportTable(SectionList *sect_list,
886881 // it in symtab and make a note using the symbol name.
887882 llvm::StringRef forwarder_name;
888883 if (auto err = entry.getForwardTo (forwarder_name)) {
889- if (log)
890- log->Format (__FILE__, __func__,
891- " ObjectFilePECOFF::AppendFromExportTable - failed to get "
892- " forwarder name of forwarder export '{0}': {1}" ,
893- sym_name, llvm::fmt_consume (std::move (err)));
894- else
895- llvm::consumeError (std::move (err));
884+ LLDB_LOG_ERROR (log, std::move (err),
885+ " ObjectFilePECOFF::AppendFromExportTable - failed to "
886+ " get forwarder name of forwarder export '{1}': {0}" ,
887+ sym_name);
896888 continue ;
897889 }
898890 llvm::SmallString<256 > new_name = {symbol.GetDisplayName ().GetStringRef (),
@@ -904,13 +896,10 @@ ObjectFilePECOFF::AppendFromExportTable(SectionList *sect_list,
904896
905897 uint32_t function_rva;
906898 if (auto err = entry.getExportRVA (function_rva)) {
907- if (log)
908- log->Format (__FILE__, __func__,
909- " ObjectFilePECOFF::AppendFromExportTable - failed to get "
910- " address of export entry '{0}': {1}" ,
911- sym_name, llvm::fmt_consume (std::move (err)));
912- else
913- llvm::consumeError (std::move (err));
899+ LLDB_LOG_ERROR (log, std::move (err),
900+ " ObjectFilePECOFF::AppendFromExportTable - failed to get "
901+ " address of export entry '{1}': {0}" ,
902+ sym_name);
914903 continue ;
915904 }
916905 // Skip the symbol if it doesn't look valid.
0 commit comments