Address remaining comments

Author: vogelsgesang

lldb/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp

@@ -61,31 +61,22 @@ class LibCXXFrameRecognizer : public StackFrameRecognizer {
             //    std::__1::__function::__value_func<void ()>::operator()[abi:ne200000]() const
             RegularExpression{""
               R"(^std::__[^:]*::)" // Namespace.
-              R"(__function::.*::operator\(\))"
-              R"((\[.*\])?)"    // ABI tag.
-              R"(( const)?$)"}, // const.
+              R"(__function::.*::operator\(\))"},
             // internal implementation details of std::function in ABI v2
             //    std::__2::__function::__policy_invoker<void (int, int)>::__call_impl[abi:ne200000]<std::__2::__function::__default_alloc_func<int (*)(int, int), int (int, int)>>
             RegularExpression{""
               R"(^std::__[^:]*::)" // Namespace.
-              R"(__function::.*::__call_impl)"
-              R"((\[.*\])?)"  // ABI tag.
-              R"(<.*>)"},     // template argument.
+              R"(__function::.*::__call_impl)"},
             // internal implementation details of std::invoke
             //   std::__1::__invoke[abi:ne200000]<void (*&)()>
             RegularExpression{
               R"(^std::__[^:]*::)" // Namespace.
-              R"(__invoke)"
-              R"((\[.*\])?)"  // ABI tag.
-              R"(<.*>)"},     // template argument.
+              R"(__invoke)"},
             // internal implementation details of std::invoke
             //   std::__1::__invoke_void_return_wrapper<void, true>::__call[abi:ne200000]<void (*&)()>
             RegularExpression{
               R"(^std::__[^:]*::)" // Namespace.
-              R"(__invoke_void_return_wrapper<.*>::__call)"
-              R"((\[.*\])?)"  // ABI tag.
-              R"(<.*>)"}      // template argument.
-
+              R"(__invoke_void_return_wrapper<.*>::__call)"}
         },
         m_hidden_frame(new LibCXXHiddenFrame()) {}
 

lldb/test/API/lang/cpp/std-invoke-recognizer/TestStdInvokeRecognizer.py

@@ -12,14 +12,16 @@ def test_frame_recognizer(self):
         """Test that implementation details of `std::invoke` are hidden"""
         self.build()
         (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(
-            self, "// break here", lldb.SBFileSpec("main.cpp")
+            self, "break here", lldb.SBFileSpec("main.cpp")
         )
 
+        stop_cnt = 0
         while process.GetState() != lldb.eStateExited:
+            stop_cnt += 1
             self.assertTrue(
                 any(
                     f in thread.GetFrameAtIndex(0).GetFunctionName()
-                    for f in ["print_num", "add", "PrintAdder"]
+                    for f in ["consume_number", "add", "Callable"]
                 )
             )
             # Skip all hidden frames
@@ -38,3 +40,5 @@ def test_frame_recognizer(self):
                 "main", thread.GetFrameAtIndex(frame_id + 1).GetFunctionName()
             )
             process.Continue()
+
+        self.assertEqual(stop_cnt, 4)

lldb/test/API/lang/cpp/std-invoke-recognizer/main.cpp

@@ -1,40 +1,36 @@
 #include <functional>
-#include <iostream>
 
-void print_num(int i) {
-  // break here
-  std::cout << i << '\n';
+void consume_number(int i) {
+  __builtin_printf("break here");
 }
 
 int add(int i, int j) {
   // break here
   return i + j;
 }
 
-struct PrintAdder {
-  PrintAdder(int num) : num_(num) {}
+struct Callable {
+  Callable(int num) : num_(num) {}
   void operator()(int i) const {
-    // break here
-    std::cout << i << '\n';
+    __builtin_printf("break here");
   }
-  void print_add(int i) const {
-    // break here
-    std::cout << num_ + i << '\n';
+  void member_function(int i) const {
+    __builtin_printf("break here");
   }
   int num_;
 };
 
 int main() {
   // Invoke a void-returning function
-  std::invoke(print_num, -9);
+  std::invoke(consume_number, -9);
 
   // Invoke a non-void-returning function
-  std::cout << std::invoke(add, 1, 10) << '\n';
+  std::invoke(add, 1, 10);
 
   // Invoke a member function
-  const PrintAdder foo(314159);
-  std::invoke(&PrintAdder::print_add, foo, 1);
+  const Callable foo(314159);
+  std::invoke(&Callable::member_function, foo, 1);
 
   // Invoke a function object
-  std::invoke(PrintAdder(12), 18);
+  std::invoke(Callable(12), 18);
 }