[Lldb-commits] [lldb] [lldb] Use LLDB_LOG_ERROR in ObjectFilePECOFF.cpp (NFC) (PR #126972)

Dave Lee via lldb-commits lldb-commits at lists.llvm.org
Wed Feb 12 13:03:25 PST 2025


https://github.com/kastiglione created https://github.com/llvm/llvm-project/pull/126972

None

>From 3a8b692f3dffc280c2e4cbbbd4041a9cd334c5f7 Mon Sep 17 00:00:00 2001
From: Dave Lee <davelee.com at gmail.com>
Date: Wed, 12 Feb 2025 12:56:34 -0800
Subject: [PATCH] [lldb] Use LLDB_LOG_ERROR in ObjectFilePECOFF.cpp (NFC)

---
 .../ObjectFile/PECOFF/ObjectFilePECOFF.cpp    | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
index 6d92a204b86cc..609968bf0bde2 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
@@ -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;
@@ -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(),
@@ -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.



More information about the lldb-commits mailing list