diff options
| -rw-r--r-- | lldb/source/Commands/CommandObjectBreakpoint.cpp | 8 | ||||
| -rw-r--r-- | lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/lldb/source/Commands/CommandObjectBreakpoint.cpp b/lldb/source/Commands/CommandObjectBreakpoint.cpp index 661ebc7..e62a115 100644 --- a/lldb/source/Commands/CommandObjectBreakpoint.cpp +++ b/lldb/source/Commands/CommandObjectBreakpoint.cpp @@ -622,6 +622,14 @@ protected: result.AppendErrorWithFormat( "Function name regular expression could not be compiled: %s", llvm::toString(std::move(err)).c_str()); + // Check if the incorrect regex looks like a globbing expression and + // warn the user about it. + if (!m_options.m_func_regexp.empty()) { + if (m_options.m_func_regexp[0] == '*' || + m_options.m_func_regexp[0] == '?') + result.AppendWarning( + "Function name regex does not accept glob patterns."); + } result.SetStatus(eReturnStatusFailed); return false; } diff --git a/lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py b/lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py index a8cfcf2..1eedb26 100644 --- a/lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py +++ b/lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py @@ -12,3 +12,19 @@ class TestCase(TestBase): self.expect("breakpoint set --func-regex (", error=True, substrs=["error: Function name regular expression could " + "not be compiled: parentheses not balanced"]) + + # Point out if looks like the user provided a globbing expression. + self.expect("breakpoint set --func-regex *a", error=True, + substrs=["error: Function name regular expression could " + + "not be compiled: repetition-operator operand invalid", + "warning: Function name regex does not accept glob patterns."]) + self.expect("breakpoint set --func-regex ?a", error=True, + substrs=["error: Function name regular expression could " + + "not be compiled: repetition-operator operand invalid", + "warning: Function name regex does not accept glob patterns."]) + # Make sure that warning is only shown for invalid regular expressions + # that look like a globbing expression (i.e., they have a leading * or ?). + self.expect("breakpoint set --func-regex a*+", error=True, matching=False, + substrs=["warning: Function name regex does not accept glob patterns."]) + self.expect("breakpoint set --func-regex a?+", error=True, matching=False, + substrs=["warning: Function name regex does not accept glob patterns."]) |