Skip to content

Commit cae735f

Browse files
committed
[lldb] Migrate runtime instrumentation plugins to ReportWarning
1 parent cc38a4a commit cae735f

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,11 @@ StructuredData::ObjectSP InstrumentationRuntimeASan::RetrieveReportData() {
136136
exe_ctx, options, address_sanitizer_retrieve_report_data_command, "",
137137
return_value_sp, eval_error);
138138
if (result != eExpressionCompleted) {
139-
process_sp->GetTarget().GetDebugger().GetAsyncOutputStream()->Printf(
140-
"Warning: Cannot evaluate AddressSanitizer expression:\n%s\n",
141-
eval_error.AsCString());
139+
StreamString ss;
140+
ss << "cannot evaluate AddressSanitizer expression:\n";
141+
ss << eval_error.AsCString();
142+
Debugger::ReportWarning(ss.GetString().str(),
143+
process_sp->GetTarget().GetDebugger().GetID());
142144
return StructuredData::ObjectSP();
143145
}
144146

lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,11 @@ StructuredData::ObjectSP InstrumentationRuntimeTSan::RetrieveReportData(
327327
exe_ctx, options, thread_sanitizer_retrieve_report_data_command, "",
328328
main_value, eval_error);
329329
if (result != eExpressionCompleted) {
330-
process_sp->GetTarget().GetDebugger().GetAsyncOutputStream()->Printf(
331-
"Warning: Cannot evaluate ThreadSanitizer expression:\n%s\n",
332-
eval_error.AsCString());
330+
StreamString ss;
331+
ss << "cannot evaluate ThreadSanitizer expression:\n";
332+
ss << eval_error.AsCString();
333+
Debugger::ReportWarning(ss.GetString().str(),
334+
process_sp->GetTarget().GetDebugger().GetID());
333335
return StructuredData::ObjectSP();
334336
}
335337

lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,11 @@ StructuredData::ObjectSP InstrumentationRuntimeUBSan::RetrieveReportData(
136136
exe_ctx, options, ub_sanitizer_retrieve_report_data_command, "",
137137
main_value, eval_error);
138138
if (result != eExpressionCompleted) {
139-
target.GetDebugger().GetAsyncOutputStream()->Printf(
140-
"Warning: Cannot evaluate UndefinedBehaviorSanitizer expression:\n%s\n",
141-
eval_error.AsCString());
139+
StreamString ss;
140+
ss << "cannot evaluate UndefinedBehaviorSanitizer expression:\n";
141+
ss << eval_error.AsCString();
142+
Debugger::ReportWarning(ss.GetString().str(),
143+
process_sp->GetTarget().GetDebugger().GetID());
142144
return StructuredData::ObjectSP();
143145
}
144146

lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const char *memory_history_asan_command_prefix = R"(
7272
void *alloc_trace[256];
7373
size_t alloc_count;
7474
int alloc_tid;
75-
75+
7676
void *free_trace[256];
7777
size_t free_count;
7878
int free_tid;
@@ -179,9 +179,11 @@ HistoryThreads MemoryHistoryASan::GetHistoryThreads(lldb::addr_t address) {
179179
ExpressionResults expr_result = UserExpression::Evaluate(
180180
exe_ctx, options, expr.GetString(), "", return_value_sp, eval_error);
181181
if (expr_result != eExpressionCompleted) {
182-
process_sp->GetTarget().GetDebugger().GetAsyncOutputStream()->Printf(
183-
"Warning: Cannot evaluate AddressSanitizer expression:\n%s\n",
184-
eval_error.AsCString());
182+
StreamString ss;
183+
ss << "cannot evaluate AddressSanitizer expression:\n";
184+
ss << eval_error.AsCString();
185+
Debugger::ReportWarning(ss.GetString().str(),
186+
process_sp->GetTarget().GetDebugger().GetID());
185187
return result;
186188
}
187189

0 commit comments

Comments
 (0)