Vendor import of lldb trunk r256945:

https://llvm.org/svn/llvm-project/lldb/trunk@256945

3 files changed, 63 insertions, 0 deletions

diff --git a/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile b/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile
new file mode 100644
index 0000000..4e4aa71
--- /dev/null
+++ b/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile
@@ -0,0 +1,11 @@
+CC ?= clang
+
+all: clean
+	mkdir hide.app
+	mkdir hide.app/Contents
+	$(CC) -g main.c
+	mv a.out.dSYM hide.app/Contents
+	strip -x a.out
+
+clean:
+	rm -rf a.out a.out.dSYM hide.app
diff --git a/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py b/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
new file mode 100644
index 0000000..497f695
--- /dev/null
+++ b/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
@@ -0,0 +1,45 @@
+"""Test that the 'add-dsym', aka 'target symbols add', succeeds in the middle of debug session."""
+
+from __future__ import print_function
+
+
+
+import os, time
+import lldb
+import sys
+from lldbsuite.test.lldbtest import *
+
+@skipUnlessDarwin
+class AddDsymMidExecutionCommandCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    def setUp(self):
+        # Call super's setUp().
+        TestBase.setUp(self)
+        self.source = 'main.c'
+
+    @no_debug_info_test # Prevent the genaration of the dwarf version of this test
+    def test_add_dsym_mid_execution(self):
+        """Test that add-dsym mid-execution loads the symbols at the right place for a slid binary."""
+        self.buildDsym(clean=True)
+        exe = os.path.join(os.getcwd(), "a.out")
+
+        self.target = self.dbg.CreateTarget(exe)
+        self.assertTrue(self.target, VALID_TARGET)
+
+        main_bp = self.target.BreakpointCreateByName ("main", "a.out")
+        self.assertTrue(main_bp, VALID_BREAKPOINT)
+
+        self.runCmd("settings set target.disable-aslr false")
+        self.process = self.target.LaunchSimple (None, None, self.get_process_working_directory())
+        self.assertTrue(self.process, PROCESS_IS_VALID)
+
+        # The stop reason of the thread should be breakpoint.
+        self.assertTrue(self.process.GetState() == lldb.eStateStopped,
+                        STOPPED_DUE_TO_BREAKPOINT)
+
+        self.runCmd("add-dsym hide.app/Contents/a.out.dSYM")
+
+        self.expect("frame select",
+                    substrs = ['a.out`main at main.c'])
diff --git a/packages/Python/lldbsuite/test/macosx/add-dsym/main.c b/packages/Python/lldbsuite/test/macosx/add-dsym/main.c
new file mode 100644
index 0000000..da9e09f
--- /dev/null
+++ b/packages/Python/lldbsuite/test/macosx/add-dsym/main.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+static int var = 5;
+int main ()
+{
+    printf ("%p is %d\n", &var, var); // break on this line
+    return ++var;
+}