[Lldb-commits] [PATCH] D78809: [lldb] Warn the user about starting the --func-regex parameter with an asterisk

[Raphael Isemann via Phabricator via lldb-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGaaf68cd9ce2f: [lldb] Warn the user about starting the --func-regex parameter with an asterisk (authored by teemperor).
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D78809/new/

https://reviews.llvm.org/D78809

Files:
  lldb/source/Commands/CommandObjectBreakpoint.cpp
  lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py


Index: lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py
===================================================================
--- lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py
+++ lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py
@@ -12,3 +12,19 @@
         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."])
Index: lldb/source/Commands/CommandObjectBreakpoint.cpp
===================================================================
--- lldb/source/Commands/CommandObjectBreakpoint.cpp
+++ lldb/source/Commands/CommandObjectBreakpoint.cpp
@@ -622,6 +622,14 @@
         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;
       }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D78809.262331.patch
Type: text/x-patch
Size: 2692 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20200506/25e62b7c/attachment-0001.bin>