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

Conversation

kastiglione
Copy link
Contributor

No description provided.

@llvmbot
Copy link
Member

llvmbot commented Feb 12, 2025

@llvm/pr-subscribers-lldb

Author: Dave Lee (kastiglione)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/126972.diff

1 Files Affected:

  • (modified) lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp (+11-22)
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.

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for cleaning this up!

@kastiglione kastiglione merged commit 277cb60 into llvm:main Feb 13, 2025
9 checks passed
@kastiglione kastiglione deleted the lldb-Use-LLDB_LOG_ERROR-in-ObjectFilePECOFF.cpp-NFC branch February 13, 2025 15:03
joaosaffran pushed a commit to joaosaffran/llvm-project that referenced this pull request Feb 14, 2025
sivan-shani pushed a commit to sivan-shani/llvm-project that referenced this pull request Feb 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants