alexshap updated this revision to Diff 131920.
alexshap added a comment.
Update, rerun the tests.
Repository:
rL LLVM
https://reviews.llvm.org/D42563
Files:
packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py
packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/a.c
packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/b.c
source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
Index: source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
===================================================================
--- source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -392,9 +392,10 @@
}
SymbolFileDWARF::SymbolFileDWARF(ObjectFile *objfile)
- : SymbolFile(objfile), UserID(0), // Used by SymbolFileDWARFDebugMap to when
- // this class parses .o files to contain
- // the .o file index/ID
+ : SymbolFile(objfile),
+ UserID(uint64_t(DW_INVALID_OFFSET) << 32), // Used by SymbolFileDWARFDebugMap to when
+ // this class parses .o files to contain
+ // the .o file index/ID
m_debug_map_module_wp(), m_debug_map_symfile(NULL), m_data_debug_abbrev(),
m_data_debug_aranges(), m_data_debug_frame(), m_data_debug_info(),
m_data_debug_line(), m_data_debug_macro(), m_data_debug_loc(),
Index: packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/b.c
===================================================================
--- /dev/null
+++ packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/b.c
@@ -0,0 +1,11 @@
+extern int f();
+
+void g() {
+ int y = 14;
+ int x = f();
+}
+
+int main() {
+ g();
+ return 0;
+}
Index: packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/a.c
===================================================================
--- /dev/null
+++ packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/a.c
@@ -0,0 +1,3 @@
+int f() {
+ return 1;
+}
Index: packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py
===================================================================
--- /dev/null
+++ packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py
@@ -0,0 +1,46 @@
+""" Testing explicit symbol loading via target symbols add. """
+import os
+import lldb
+import sys
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+class TestMixedDwarfBinary(TestBase):
+ mydir = TestBase.compute_mydir(__file__)
+
+ def setUp(self):
+ TestBase.setUp(self)
+
+ @no_debug_info_test # Prevent the genaration of the dwarf version of this test
+ @add_test_categories(["dwo"])
+ @skipUnlessPlatform(['linux'])
+ def test_target_symbols_add(self):
+ """Test that 'frame variable' works
+ for the executable built from two source files compiled
+ with/whithout -gsplit-dwarf correspondingly."""
+
+ self.build()
+ exe = os.path.join(os.getcwd(), "main")
+
+ self.target = self.dbg.CreateTarget(exe)
+ self.assertTrue(self.target, VALID_TARGET)
+
+ main_bp = self.target.BreakpointCreateByName("g", "main")
+ 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)
+
+ frame = self.process.GetThreadAtIndex(0).GetFrameAtIndex(0)
+ x = frame.FindVariable("x")
+ self.assertTrue(x.IsValid(), "x is not valid")
+ y = frame.FindVariable("y")
+ self.assertTrue(y.IsValid(), "y is not valid")
+
Index: packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
===================================================================
--- /dev/null
+++ packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
@@ -0,0 +1,17 @@
+.PHONY : all
+.PHONY : clean
+all: main
+
+CCFLAGS=-O0 -g
+
+a.o : a.c
+ "$(CC)" $(CCFLAGS) -gsplit-dwarf -c "$<" -o "$@"
+
+b.o : b.c
+ "$(CC)" $(CCFLAGS) -c "$<" -o "$@"
+
+main : a.o b.o
+ "$(CC)" $^ -o "$@"
+
+clean:
+ rm -f a.dwo a.o b.o main
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
