Merge pull request #7862 from Michael137/bugfix/lldb-loclist-cpp-member-to-20230725

[cherry-pick][stable/20230725] [lldb][Symbol] Make sure we decrement PC before checking location list

Author: Michael137

lldb/source/Symbol/Variable.cpp

@@ -227,7 +227,8 @@ bool Variable::LocationIsValidForFrame(StackFrame *frame) {
       // contains the current address when converted to a load address
       return m_location_list.ContainsAddress(
           loclist_base_load_addr,
-          frame->GetFrameCodeAddress().GetLoadAddress(target_sp.get()));
+          frame->GetFrameCodeAddressForSymbolication().GetLoadAddress(
+              target_sp.get()));
     }
   }
   return false;

lldb/test/API/functionalities/location-list-lookup/Makefile

@@ -1,3 +1,3 @@
-C_SOURCES := main.c
+CXX_SOURCES := main.cpp
 CFLAGS_EXTRAS := -O1
 include Makefile.rules

lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py

@@ -7,16 +7,8 @@
 
 
 class LocationListLookupTestCase(TestBase):
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-
-    @skipIf(oslist=["linux"], archs=["arm"])
-    def test_loclist(self):
-        self.build()
+    def launch(self) -> lldb.SBProcess:
         exe = self.getBuildArtifact("a.out")
-
-        # Create a target by the debugger.
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
         self.dbg.SetAsync(False)
@@ -27,12 +19,32 @@ def test_loclist(self):
         self.assertTrue(process.IsValid())
         self.assertTrue(process.is_stopped)
 
-        # Find `main` on the stack, then
-        # find `argv` local variable, then
-        # check that we can read the c-string in argv[0]
+        return process
+
+    def check_local_vars(self, process: lldb.SBProcess, check_expr: bool):
+        # Find `bar` on the stack, then
+        # make sure we can read out the local
+        # variables (with both `frame var` and `expr`)
         for f in process.GetSelectedThread().frames:
-            if f.GetDisplayFunctionName() == "main":
+            frame_name = f.GetDisplayFunctionName()
+            if frame_name is not None and frame_name.startswith("Foo::bar"):
                 argv = f.GetValueForVariablePath("argv").GetChildAtIndex(0)
                 strm = lldb.SBStream()
                 argv.GetDescription(strm)
                 self.assertNotEqual(strm.GetData().find("a.out"), -1)
+
+                if check_expr:
+                    process.GetSelectedThread().SetSelectedFrame(f.idx)
+                    self.expect_expr("this", result_type="Foo *")
+
+    @skipIf(oslist=["linux"], archs=["arm"])
+    @skipIfDarwin
+    def test_loclist_frame_var(self):
+        self.build()
+        self.check_local_vars(self.launch(), check_expr=False)
+
+    @skipIf(archs=no_match(["aarch64", "arm"]))
+    @skipUnlessDarwin
+    def test_loclist_expr(self):
+        self.build()
+        self.check_local_vars(self.launch(), check_expr=True)

lldb/test/API/functionalities/location-list-lookup/main.c

@@ -0,0 +1,23 @@
+#include <cstdio>
+#include <cstdlib>
+
+void func(int in);
+
+struct Foo {
+  int x;
+  [[clang::noinline]] void bar(char **argv);
+};
+
+int main(int argc, char **argv) {
+  Foo f{.x = 5};
+  std::printf("%p\n", &f.x);
+  f.bar(argv);
+  return f.x;
+}
+
+void Foo::bar(char **argv) {
+  std::printf("%p %p\n", argv, this);
+  std::abort(); /// 'this' should be still accessible
+}
+
+void func(int in) { printf("%d\n", in); }