1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
commit 13dfb8f01ded137f634b8b6aa8a5ce2bc3e65daf
Author: Ron Lieberman <ron.lieberman@amd.com>
Date: Sun Apr 23 07:12:23 2023 -0500
[symbolizer] API evolution for ErrorHandler
Change-Id: I438358dc79195444aed0658942b23869eda8117e
diff --git a/src/comgr-symbolizer.cpp b/src/comgr-symbolizer.cpp
index cfdeee8..36643cf 100644
--- a/src/comgr-symbolizer.cpp
+++ b/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(
|
