Author: davide
Date: Tue Jan 30 20:13:37 2018
New Revision: 323845
URL: http://llvm.org/viewvc/llvm-project?rev=323845&view=rev
Log:
Revert "[lldb] Enable debugging of binaries with mixed (splitted/regular) dwarf"
It might have caused some instability on the bots.
Removed:
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/a.c
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/b.c
Modified:
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
Removed:
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile?rev=323844&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile
(removed)
@@ -1,10 +0,0 @@
-LEVEL := ../../make
-
-C_SOURCES := a.c b.c
-a.o: CFLAGS_EXTRAS += -gsplit-dwarf
-
-include $(LEVEL)/Makefile.rules
-
-.PHONY: clean
-clean::
- $(RM) -f a.dwo a.o b.o main
Removed:
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py?rev=323844&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py
(removed)
@@ -1,46 +0,0 @@
-""" Testing debugging of a binary with "mixed" dwarf (with/without fission).
"""
-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_mixed_dwarf(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(), "a.out")
-
- self.target = self.dbg.CreateTarget(exe)
- self.assertTrue(self.target, VALID_TARGET)
-
- main_bp = self.target.BreakpointCreateByName("g", "a.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)
-
- 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")
-
Removed:
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/a.c
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/a.c?rev=323844&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/a.c
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/a.c
(removed)
@@ -1,3 +0,0 @@
-int f() {
- return 1;
-}
Removed:
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/b.c
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/b.c?rev=323844&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/b.c
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/b.c
(removed)
@@ -1,11 +0,0 @@
-extern int f();
-
-void g() {
- int y = 14;
- int x = f();
-}
-
-int main() {
- g();
- return 0;
-}
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp?rev=323845&r1=323844&r2=323845&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp Tue Jan 30
20:13:37 2018
@@ -392,10 +392,9 @@ SymbolFileDWARF::GetParentSymbolContextD
}
SymbolFileDWARF::SymbolFileDWARF(ObjectFile *objfile)
- : 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
+ : SymbolFile(objfile), UserID(0), // 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(),
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
