[DWARFASTParserClang] Start with member offset of 0 for members of union types.

Summary:
GCC does not emit DW_AT_data_member_location for members of a union.
Starting with a 0 value for member locations helps is reading union types
in such cases.

Reviewers: clayborg

Subscribers: ldrumm, lldb-commits

Differential Revision: http://reviews.llvm.org/D18008

llvm-svn: 263085

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile
new file mode 100644 (file)
index 0000000..b09a579
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/unions/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../../../make
+
+C_SOURCES := main.c
+
+include $(LEVEL)/Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unions/TestUnionMembers.py b/lldb/packages/Python/lldbsuite/test/lang/c/unions/TestUnionMembers.py
new file mode 100644 (file)
index 0000000..114be3a
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/unions/TestUnionMembers.py
@@ -0,0 +1,46 @@
+import lldb
+from lldbsuite.test.lldbtest import *
+import lldbsuite.test.lldbutil as lldbutil
+
+class TestUnionMembers(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    def test_union_members(self):
+        self._load_exe()
+
+        # Set breakpoints
+        bp = self.target.BreakpointCreateBySourceRegex("Break here", self.src_file_spec)
+        self.assertTrue(bp.IsValid() and bp.GetNumLocations() >= 1, VALID_BREAKPOINT)
+
+        # Launch the process
+        self.process = self.target.LaunchSimple(None, None, self.get_process_working_directory())
+        self.assertTrue(self.process.IsValid(), PROCESS_IS_VALID)
+        self.assertTrue(self.process.GetState() == lldb.eStateStopped, PROCESS_STOPPED)
+
+        thread = lldbutil.get_stopped_thread(self.process, lldb.eStopReasonBreakpoint)
+        self.assertTrue(thread.IsValid())
+        frame = thread.GetSelectedFrame()
+        self.assertTrue(frame.IsValid())
+
+        val = frame.EvaluateExpression("u");
+        self.assertTrue(val.IsValid())
+        val = frame.EvaluateExpression("u.s");
+        self.assertTrue(val.IsValid())
+        self.assertEqual(val.GetNumChildren(), 2)
+
+    def _load_exe(self):
+        self.build()
+
+        cwd = os.getcwd()
+
+        src_file = os.path.join(cwd, "main.c")
+        self.src_file_spec = lldb.SBFileSpec(src_file)
+        self.assertTrue(self.src_file_spec.IsValid(), "breakpoint file")
+
+        # Get the path of the executable
+        exe_path  = os.path.join(cwd, 'a.out')
+
+        # Load the executable
+        self.target = self.dbg.CreateTarget(exe_path)
+        self.assertTrue(self.target.IsValid(), VALID_TARGET)

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/unions/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/unions/main.c
new file mode 100644 (file)
index 0000000..2c6a7d1
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/unions/main.c
@@ -0,0 +1,18 @@
+#include <stdint.h>
+
+union S
+{
+    int32_t n;     // occupies 4 bytes
+    uint16_t s[2]; // occupies 4 bytes
+    uint8_t c;     // occupies 1 byte
+};                 // the whole union occupies 4 bytes
+
+int main()
+{
+  union S u;
+
+  u.s[0] = 1234;
+  u.s[1] = 4321;
+
+  return 0; // Break here
+}

diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
index b809233..8293415 100644 (file)
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
@@ -2673,7 +2673,7 @@ DWARFASTParserClang::ParseChildMembers (const SymbolContext& sc,
                     bool is_artificial = false;
                     DWARFFormValue encoding_form;
                     AccessType accessibility = eAccessNone;
-                    uint32_t member_byte_offset = UINT32_MAX;
+                    uint32_t member_byte_offset = (parent_die.Tag() == DW_TAG_union_type) ? 0 : UINT32_MAX;
                     size_t byte_size = 0;
                     size_t bit_offset = 0;
                     size_t bit_size = 0;