diff options
author | Zachary Turner <zturner@google.com> | 2016-09-21 16:01:28 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2016-09-21 16:01:28 +0000 |
commit | 95eae4235d4cfa5cee67ab6c4e686baf8a57e9e5 (patch) | |
tree | 0e9d2a42e76e13cf5ed5d6a8f0b935a83e40ea69 /lldb/source/Target/ThreadPlanStepInRange.cpp | |
parent | 07171f21d148d340115ec634be6a7f296799517d (diff) | |
download | bcm5719-llvm-95eae4235d4cfa5cee67ab6c4e686baf8a57e9e5.tar.gz bcm5719-llvm-95eae4235d4cfa5cee67ab6c4e686baf8a57e9e5.zip |
Make lldb::Regex use StringRef.
This updates getters and setters to use StringRef instead of
const char *. I tested the build on Linux, Windows, and OSX
and saw no build or test failures. I cannot test any BSD
or Android variants, however I expect the required changes
to be minimal or non-existant.
llvm-svn: 282079
Diffstat (limited to 'lldb/source/Target/ThreadPlanStepInRange.cpp')
-rw-r--r-- | lldb/source/Target/ThreadPlanStepInRange.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lldb/source/Target/ThreadPlanStepInRange.cpp b/lldb/source/Target/ThreadPlanStepInRange.cpp index 3eece2fc41b..03f6679ae32 100644 --- a/lldb/source/Target/ThreadPlanStepInRange.cpp +++ b/lldb/source/Target/ThreadPlanStepInRange.cpp @@ -298,10 +298,11 @@ bool ThreadPlanStepInRange::ShouldStop(Event *event_ptr) { } void ThreadPlanStepInRange::SetAvoidRegexp(const char *name) { + auto name_ref = llvm::StringRef::withNullAsEmpty(name); if (!m_avoid_regexp_ap) - m_avoid_regexp_ap.reset(new RegularExpression(name)); + m_avoid_regexp_ap.reset(new RegularExpression(name_ref)); - m_avoid_regexp_ap->Compile(name); + m_avoid_regexp_ap->Compile(name_ref); } void ThreadPlanStepInRange::SetDefaultFlagValue(uint32_t new_value) { @@ -361,7 +362,8 @@ bool ThreadPlanStepInRange::FrameMatchesAvoidCriteria() { regex_match.GetMatchAtIndex(frame_function_name, 0, match); log->Printf("Stepping out of function \"%s\" because it matches " "the avoid regexp \"%s\" - match substring: \"%s\".", - frame_function_name, avoid_regexp_to_use->GetText(), + frame_function_name, + avoid_regexp_to_use->GetText().str().c_str(), match.c_str()); } } |