[symbolizer] API evolution for ErrorHandler

Change-Id: I438358dc79195444aed0658942b23869eda8117e
trixirt · Apr 23, 2023 · 13dfb8f · 13dfb8f
1 parent 4abec2f
commit 13dfb8f
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/lib/comgr/src/comgr-symbolizer.cpp b/lib/comgr/src/comgr-symbolizer.cpp
@@ -57,6 +57,16 @@ static llvm::symbolize::PrinterConfig getDefaultPrinterConfig() {
   return Config;
 }
 
+static llvm::symbolize::ErrorHandler symbolize_error_handler(
+    llvm::raw_string_ostream &OS) {
+  return
+      [&](const llvm::ErrorInfoBase &ErrorInfo, llvm::StringRef ErrorBanner) {
+        OS << ErrorBanner;
+        ErrorInfo.log(OS);
+        OS << '\n';
+      };
+}
+
 Symbolizer::Symbolizer(std::unique_ptr<ObjectFile> &&CodeObject,
                        PrintSymbolCallback PrintSymbol)
     : CodeObject(std::move(CodeObject)), PrintSymbol(PrintSymbol) {}
@@ -93,7 +103,7 @@ amd_comgr_status_t Symbolizer::symbolize(uint64_t Address, bool IsCode,
   llvm::raw_string_ostream OS(Result);
   llvm::symbolize::PrinterConfig Config = getDefaultPrinterConfig();
   llvm::symbolize::Request Request{"", Address};
-  auto Printer = std::make_unique<llvm::symbolize::LLVMPrinter>(OS, OS, Config);
+  auto Printer = std::make_unique<llvm::symbolize::LLVMPrinter>(OS, symbolize_error_handler(OS), Config);
 
   if (IsCode) {
     auto ResOrErr = SymbolizerImpl.symbolizeInlinedCode(