Merge pull request #6400 from Michael137/bugfix/lldb-member-func-ptr-format-to-20221013

[cherry-pick][stable/20221013] [lldb][test] TestDataFormatterCpp.py: fix expected format for member pointers

Author: Michael137

lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py

@@ -11,7 +11,6 @@
 
 
 class CppDataFormatterTestCase(TestBase):
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
@@ -286,15 +285,23 @@ def cleanup():
             substrs=['(int) iAmInt = 0x00000001'])
         self.expect("frame variable iAmInt", substrs=['(int) iAmInt = 1'])
 
-        # Check that pointer to members are correctly formatted
+    @skipIfWindows
+    def test_mem_func_ptr_formats(self):
+        self.build()
+
+        lldbutil.run_to_source_breakpoint(self, "Break in has_local_mem_func_pointers", lldb.SBFileSpec("main.cpp"))
+
         self.expect(
             "frame variable member_ptr",
-            substrs=['member_ptr = 0x'])
+            patterns=['member_ptr = 0x[0-9a-z]+'])
         self.expect(
             "frame variable member_func_ptr",
-            substrs=['member_func_ptr = 0x',
-                     '(a.out`IUseCharStar::member_func(int) at main.cpp:61)'])
+            patterns=['member_func_ptr = 0x[0-9a-z]+'],
+            substrs=['(a.out`IUseCharStar::member_func(int) at main.cpp:61)'])
         self.expect(
             "frame variable ref_to_member_func_ptr",
-            substrs=['ref_to_member_func_ptr = 0x',
-                     '(a.out`IUseCharStar::member_func(int) at main.cpp:61)'])
+            patterns=['ref_to_member_func_ptr = 0x[0-9a-z]+'],
+            substrs=['(a.out`IUseCharStar::member_func(int) at main.cpp:61)'])
+        self.expect(
+            "frame variable virt_member_func_ptr",
+            patterns=['virt_member_func_ptr = 0x[0-9a-z]+$'])

lldb/test/API/functionalities/data-formatter/data-formatter-cpp/main.cpp

@@ -59,8 +59,21 @@ struct IUseCharStar
 	IUseCharStar() : pointer("Hello world") {}
 
         char const *member_func(int) { return ""; }
+        virtual void virt_member_func() {}
 };
 
+void has_local_mem_func_pointers() {
+  const char *IUseCharStar::*member_ptr = &IUseCharStar::pointer;
+  const char *(IUseCharStar::*member_func_ptr)(int) =
+      &IUseCharStar::member_func;
+  auto &ref_to_member_func_ptr = member_func_ptr;
+  
+  void (IUseCharStar::*virt_member_func_ptr)() =
+      &IUseCharStar::virt_member_func;
+
+  ::puts("Break in has_local_mem_func_pointers");
+}
+
 int main (int argc, const char * argv[])
 {
 
@@ -109,10 +122,7 @@ int main (int argc, const char * argv[])
 
     i_am_cooler the_coolest_guy(1,2,3.14,6.28,'E','G');
 
-    const char *IUseCharStar::*member_ptr = &IUseCharStar::pointer;
-    const char *(IUseCharStar::*member_func_ptr)(int) =
-        &IUseCharStar::member_func;
-    auto &ref_to_member_func_ptr = member_func_ptr;
+    has_local_mem_func_pointers();
 
     return 0; // Set break point at this line.
 }