Made GetConditionText const everywhere. Made it return NULL when there's no condition
like the doc's say it should. Make sure we have a condition before we set up a test whether
we have one, so we only present a "could not parse condition" error if we actually have a condition.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@133088 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Breakpoint/BreakpointLocation.cpp b/source/Breakpoint/BreakpointLocation.cpp
index 311555c..f068c72 100644
--- a/source/Breakpoint/BreakpointLocation.cpp
+++ b/source/Breakpoint/BreakpointLocation.cpp
@@ -157,9 +157,9 @@
}
const char *
-BreakpointLocation::GetConditionText ()
+BreakpointLocation::GetConditionText () const
{
- return GetLocationOptions()->GetConditionText();
+ return GetOptionsNoCreate()->GetConditionText();
}
uint32_t
@@ -226,7 +226,7 @@
// The SYNCHRONOUS callback says we should stop, next try the condition.
- if (should_stop)
+ if (should_stop && GetConditionText() != NULL)
{
// We need to make sure the user sees any parse errors in their condition, so we'll hook the
// constructor errors up to the debugger's Async I/O.