Extend 'target symbols add' to load symbols from a given module

Now -shlib flag can be provided alongside with names of symbols files:

(lldb) target symbols add --shlib stripper-lib.so unstripper-lib.so

This is helpful when default matching mechanisms by name and UUID
can't find a module, and the user needs to explicitly specify
which module the given symbol file belongs to.

Differential Revision: https://reviews.llvm.org/D35607

llvm-svn: 308933

3 files changed, 70 insertions, 0 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
new file mode 100644
index 00000000000..c701797f0a7
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
@@ -0,0 +1,12 @@
+LEVEL = ../../make
+CXX_SOURCES := main.cpp
+LD_EXTRAS += -Wl,--build-id=none
+
+localall : stripped.out all
+stripped.out : a.out
+				       $(OBJCOPY) --remove-section=.note.gnu.build-id --remove-section=.gnu_debuglink --strip-debug a.out stripped.out
+
+clean::
+				$(RM) stripped.out
+
+include $(LEVEL)/Makefile.rules
\ No newline at end of file
diff --git a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/TestTargetSymbolsAddCommand.py b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/TestTargetSymbolsAddCommand.py
new file mode 100644
index 00000000000..477ddf9c15b
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/TestTargetSymbolsAddCommand.py
@@ -0,0 +1,52 @@
+""" Testing explicit symbol loading via target symbols add. """
+import os
+import time
+import lldb
+import sys
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+class TargetSymbolsAddCommand(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    def setUp(self):
+        TestBase.setUp(self)
+        self.source = 'main.c'
+
+    @no_debug_info_test  # Prevent the genaration of the dwarf version of this test
+    @skipUnlessPlatform(['linux'])
+    def test_target_symbols_add(self):
+        """Test that 'target symbols add' can load the symbols
+        even if gnu.build-id and gnu_debuglink are not present in the module.
+        Similar to test_add_dsym_mid_execution test for macos."""
+        self.build(clean=True)
+        exe = os.path.join(os.getcwd(), "stripped.out")
+
+        self.target = self.dbg.CreateTarget(exe)
+        self.assertTrue(self.target, VALID_TARGET)
+
+        main_bp = self.target.BreakpointCreateByName("main", "stripped.out")
+        self.assertTrue(main_bp, VALID_BREAKPOINT)
+
+        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)
+
+        exe_module = self.target.GetModuleAtIndex(0)
+
+        # Check that symbols are not loaded and main.c is not know to be
+        # the source file.
+        self.expect("frame select", substrs=['main.c'], matching=False)
+
+        # Tell LLDB that a.out has symbols for stripped.out
+        self.runCmd("target symbols add -s stripped.out a.out")
+
+        # Check that symbols are now loaded and main.c is in the output.
+        self.expect("frame select", substrs=['main.c'])
diff --git a/lldb/packages/Python/lldbsuite/test/linux/add-symbols/main.c b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/main.c
new file mode 100644
index 00000000000..5a0915746b7
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/linux/add-symbols/main.c
@@ -0,0 +1,6 @@
+#include <stdio.h>
+static int var = 5;
+int main() {
+  printf("%p is %d\n", &var, var);
+  return ++var;
+}