jingham updated this revision to Diff 464442.
jingham added a comment.
Handled hitting the sanitizer breakpoint while calling a function in
StopInfoBreakpoint.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D134927/new/
https://reviews.llvm.org/D134927
Files:
lldb/include/lldb/Breakpoint/Breakpoint.h
lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp
lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.cpp
lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp
lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp
lldb/source/Target/StopInfo.cpp
lldb/test/API/functionalities/ubsan/basic/TestUbsanBasic.py
lldb/test/API/functionalities/ubsan/basic/main.c
Index: lldb/test/API/functionalities/ubsan/basic/main.c
===================================================================
--- lldb/test/API/functionalities/ubsan/basic/main.c
+++ lldb/test/API/functionalities/ubsan/basic/main.c
@@ -1,4 +1,16 @@
int main() {
int data[4];
- return *(int *)(((char *)&data[0]) + 2); // align line
+ int result = *(int *)(((char *)&data[0]) + 2); // align line
+
+ int *p = data + 5; // Index 5 out of bounds for type 'int [4]'
+ *p = data + 5;
+ *p = data + 5;
+ *p = data + 5;
+ *p = data + 5;
+ *p = data + 5;
+ *p = data + 5;
+ *p = data + 5;
+ *p = data + 5;
+
+ return 0;
}
Index: lldb/test/API/functionalities/ubsan/basic/TestUbsanBasic.py
===================================================================
--- lldb/test/API/functionalities/ubsan/basic/TestUbsanBasic.py
+++ lldb/test/API/functionalities/ubsan/basic/TestUbsanBasic.py
@@ -86,4 +86,9 @@
self.assertEqual(os.path.basename(data["filename"]), "main.c")
self.assertEqual(data["line"], self.line_align)
- self.runCmd("continue")
+ for count in range(0,8):
+ process.Continue()
+ stop_reason = thread.GetStopReason()
+ self.assertEqual(stop_reason, lldb.eStopReasonInstrumentation,
+ "Round {0} wasn't instrumentation".format(count))
+
Index: lldb/source/Target/StopInfo.cpp
===================================================================
--- lldb/source/Target/StopInfo.cpp
+++ lldb/source/Target/StopInfo.cpp
@@ -362,29 +362,21 @@
" not running commands to avoid recursion.");
bool ignoring_breakpoints =
process->GetIgnoreBreakpointsInExpressions();
- if (ignoring_breakpoints) {
- m_should_stop = false;
- // Internal breakpoints will always stop.
- for (size_t j = 0; j < num_owners; j++) {
- lldb::BreakpointLocationSP bp_loc_sp =
- bp_site_sp->GetOwnerAtIndex(j);
- if (bp_loc_sp->GetBreakpoint().IsInternal()) {
- m_should_stop = true;
- break;
- }
- }
- } else {
- m_should_stop = true;
+ // Internal breakpoints should be allowed to do their job, we
+ // can make sure they don't do anything that would cause recursive
+ // command execution:
+ if (!m_was_all_internal) {
+ m_should_stop = !ignoring_breakpoints;
+ LLDB_LOGF(log,
+ "StopInfoBreakpoint::PerformAction - in expression, "
+ "continuing: %s.",
+ m_should_stop ? "true" : "false");
+ Debugger::ReportWarning(
+ "hit breakpoint while running function, skipping commands "
+ "and conditions to prevent recursion",
+ process->GetTarget().GetDebugger().GetID());
+ return;
}
- LLDB_LOGF(log,
- "StopInfoBreakpoint::PerformAction - in expression, "
- "continuing: %s.",
- m_should_stop ? "true" : "false");
- Debugger::ReportWarning(
- "hit breakpoint while running function, skipping commands and "
- "conditions to prevent recursion",
- process->GetTarget().GetDebugger().GetID());
- return;
}
StoppointCallbackContext context(event_ptr, exe_ctx, false);
Index: lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp
===================================================================
--- lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp
+++ lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp
@@ -275,8 +275,9 @@
.CreateBreakpoint(symbol_address, /*internal=*/true,
/*hardware=*/false)
.get();
+ const bool sync = false;
breakpoint->SetCallback(InstrumentationRuntimeUBSan::NotifyBreakpointHit,
- this, true);
+ this, sync);
breakpoint->SetBreakpointKind("undefined-behavior-sanitizer-report");
SetBreakpointID(breakpoint->GetID());
Index: lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp
===================================================================
--- lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp
+++ lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp
@@ -915,14 +915,15 @@
if (symbol_address == LLDB_INVALID_ADDRESS)
return;
- bool internal = true;
- bool hardware = false;
+ const bool internal = true;
+ const bool hardware = false;
+ const bool sync = false;
Breakpoint *breakpoint =
process_sp->GetTarget()
.CreateBreakpoint(symbol_address, internal, hardware)
.get();
breakpoint->SetCallback(InstrumentationRuntimeTSan::NotifyBreakpointHit, this,
- true);
+ sync);
breakpoint->SetBreakpointKind("thread-sanitizer-report");
SetBreakpointID(breakpoint->GetID());
Index: lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.cpp
===================================================================
--- lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.cpp
+++ lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.cpp
@@ -214,8 +214,9 @@
.CreateBreakpoint(symbol_address, /*internal=*/true,
/*hardware=*/false)
.get();
+ const bool sync = false;
breakpoint->SetCallback(
- InstrumentationRuntimeMainThreadChecker::NotifyBreakpointHit, this, true);
+ InstrumentationRuntimeMainThreadChecker::NotifyBreakpointHit, this, sync);
breakpoint->SetBreakpointKind("main-thread-checker-report");
SetBreakpointID(breakpoint->GetID());
Index: lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp
===================================================================
--- lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp
+++ lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp
@@ -299,14 +299,15 @@
if (symbol_address == LLDB_INVALID_ADDRESS)
return;
- bool internal = true;
- bool hardware = false;
+ const bool internal = true;
+ const bool hardware = false;
+ const bool sync = false;
Breakpoint *breakpoint =
process_sp->GetTarget()
.CreateBreakpoint(symbol_address, internal, hardware)
.get();
breakpoint->SetCallback(InstrumentationRuntimeASan::NotifyBreakpointHit, this,
- true);
+ sync);
breakpoint->SetBreakpointKind("address-sanitizer-report");
SetBreakpointID(breakpoint->GetID());
Index: lldb/include/lldb/Breakpoint/Breakpoint.h
===================================================================
--- lldb/include/lldb/Breakpoint/Breakpoint.h
+++ lldb/include/lldb/Breakpoint/Breakpoint.h
@@ -382,7 +382,10 @@
/// \param[in] is_synchronous
/// If \b true the callback will be run on the private event thread
/// before the stop event gets reported. If false, the callback will get
- /// handled on the public event thread after the stop has been posted.
+ /// handled on the public event thread while the stop event is being
+ /// pulled off the event queue.
+ /// Note: synchronous callbacks cannot cause the target to run, in
+ /// particular, they should not try to run the expression evaluator.
void SetCallback(BreakpointHitCallback callback, void *baton,
bool is_synchronous = false);
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
