[PATCH] libdw: dwarf_get_units find split units from .dwo.

[PATCH] libdw: dwarf_get_units find split units from .dwo.

[Mark Wielaard]

For a skeleton DIE dwarf_get_units should provide the split DIE as subdie.
This implements that by trying to find the (named) .dwo file and finding
the matching CU in it. The .dwo file is search relative to the current
DWARF or using the comp_dir of the skeleton DIE.

Also fixes a small issue with str_offsets_base_off which is tested in the
new testcase (by getting the name of the split CU DIE).

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 libdw/ChangeLog                 |  15 +++++
 libdw/Makefile.am               |   3 +-
 libdw/dwarf_end.c               |   5 ++
 libdw/dwarf_get_units.c         |  23 ++++++--
 libdw/libdwP.h                  |  14 ++++-
 libdw/libdw_find_split_unit.c   | 118 ++++++++++++++++++++++++++++++++++++++++
 libdw/libdw_findcu.c            |   1 +
 tests/ChangeLog                 |  20 +++++++
 tests/Makefile.am               |  10 +++-
 tests/get-units-split.c         | 101 ++++++++++++++++++++++++++++++++++
 tests/run-get-units-split.sh    |  65 ++++++++++++++++++++++
 tests/testfile-dwarf-45.source  |   8 +++
 tests/testfile-hello4.dwo.bz2   | Bin 0 -> 1453 bytes
 tests/testfile-hello5.dwo.bz2   | Bin 0 -> 1520 bytes
 tests/testfile-splitdwarf-4.bz2 | Bin 0 -> 3591 bytes
 tests/testfile-splitdwarf-5.bz2 | Bin 0 -> 3611 bytes
 tests/testfile-world4.dwo.bz2   | Bin 0 -> 1444 bytes
 tests/testfile-world5.dwo.bz2   | Bin 0 -> 1498 bytes
 18 files changed, 374 insertions(+), 9 deletions(-)
 create mode 100644 libdw/libdw_find_split_unit.c
 create mode 100644 tests/get-units-split.c
 create mode 100755 tests/run-get-units-split.sh
 create mode 100644 tests/testfile-hello4.dwo.bz2
 create mode 100644 tests/testfile-hello5.dwo.bz2
 create mode 100755 tests/testfile-splitdwarf-4.bz2
 create mode 100755 tests/testfile-splitdwarf-5.bz2
 create mode 100644 tests/testfile-world4.dwo.bz2
 create mode 100644 tests/testfile-world5.dwo.bz2

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 385f52c..a87a709 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,5 +1,20 @@
 2018-05-15  Mark Wielaard  <mark@klomp.org>
 
+	* Makefile.am (libdw_a_SOURCES): Add libdw_find_split_unit.c.
+	* dwarf_end.c (cu_free): Free split Dwarf.
+	* dwarf_get_units.c (dwarf_get_units): Handle DW_UT_skeleton by
+	calling __libdw_find_split_unit.
+	* libdwP.h (struct Dwarf_CU): Add split Dwarf_CU field.
+	(__libdw_find_split_unit): New function prototype.
+	(str_offsets_base_off): Use cu Dwarf if dbg is NULL.
+	(filepath): Rename to ...
+	(__libdw_filepath): This. Which is the actual function name in
+	dwarf_getalt.c.
+	(libdw_find_split_unit.c): New file.
+	* libdw_findcu.c (__libdw_intern_next_unit): Initialize split to -1.
+
+2018-05-15  Mark Wielaard  <mark@klomp.org>
+
 	* libdwP.h (__libdw_first_die_from_cu_start): Adjust commented out
 	asserts.
 	* libdw_findcu.c (__libdw_intern_next_unit): For version 4 DWARF if
diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 8848f14..ba9919c 100644
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -90,7 +90,8 @@ libdw_a_SOURCES = dwarf_begin.c dwarf_begin_elf.c dwarf_end.c dwarf_getelf.c \
 		  dwarf_getlocation_die.c dwarf_getlocation_attr.c \
 		  dwarf_getalt.c dwarf_setalt.c dwarf_cu_getdwarf.c \
 		  dwarf_cu_die.c dwarf_peel_type.c dwarf_default_lower_bound.c \
-		  dwarf_die_addr_die.c dwarf_get_units.c
+		  dwarf_die_addr_die.c dwarf_get_units.c \
+		  libdw_find_split_unit.c
 
 if MAINTAINER_MODE
 BUILT_SOURCES = $(srcdir)/known-dwarf.h
diff --git a/libdw/dwarf_end.c b/libdw/dwarf_end.c
index f6915ab..43223de 100644
--- a/libdw/dwarf_end.c
+++ b/libdw/dwarf_end.c
@@ -55,6 +55,11 @@ cu_free (void *arg)
   Dwarf_Abbrev_Hash_free (&p->abbrev_hash);
 
   tdestroy (p->locs, noop_free);
+
+  /* Free split dwarf one way (from skeleton to split).  */
+  if (p->unit_type == DW_UT_skeleton
+      && p->split != NULL && p->split != (void *)-1)
+    INTUSE(dwarf_end) (p->split->dbg);
 }
 
 
diff --git a/libdw/dwarf_get_units.c b/libdw/dwarf_get_units.c
index 19ff5de..aece17e 100644
--- a/libdw/dwarf_get_units.c
+++ b/libdw/dwarf_get_units.c
@@ -100,10 +100,25 @@ dwarf_get_units (Dwarf *dwarf, Dwarf_CU *cu, Dwarf_CU **next_cu,
 
   if (subdie != NULL)
     {
-      if (next->version >= 2 && next->version <= 5
-	  && (next->unit_type == DW_UT_type
-	      || next->unit_type == DW_UT_split_type))
-	*subdie = SUBDIE(next);
+      if (next->version >= 2 && next->version <= 5)
+	{
+	  /* For types, return the actual type DIE.  For skeletons,
+	     find the associated split compile unit and return its
+	     DIE.  */
+	  if (next->unit_type == DW_UT_type
+	      || next->unit_type == DW_UT_split_type)
+	    *subdie = SUBDIE(next);
+	  else if (next->unit_type == DW_UT_skeleton)
+	    {
+	      Dwarf_CU *split_cu = __libdw_find_split_unit (next);
+	      if (split_cu != NULL)
+		*subdie = CUDIE(split_cu);
+	      else
+		memset (subdie, '\0', sizeof (Dwarf_Die));
+	    }
+	  else
+	    memset (subdie, '\0', sizeof (Dwarf_Die));
+	}
       else
 	memset (subdie, '\0', sizeof (Dwarf_Die));
     }
diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index 25a5ad3..6057227 100644
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -314,6 +314,12 @@ struct Dwarf_CU
   size_t subdie_offset;
   uint64_t unit_id8;
 
+  /* If this is a skeleton unit this points to the split compile unit.
+     Or the other way around if this is a split compile unit.  Set to -1
+     if not yet searched.  Always use __libdw_find_split_unit to access
+     this field.  */
+  struct Dwarf_CU *split;
+
   /* Hash table for the abbreviations.  */
   Dwarf_Abbrev_Hash abbrev_hash;
   /* Offset of the first abbreviation.  */
@@ -589,6 +595,9 @@ extern struct Dwarf_CU *__libdw_findcu (Dwarf *dbg, Dwarf_Off offset, bool tu)
 extern struct Dwarf_CU *__libdw_findcu_addr (Dwarf *dbg, void *addr)
      __nonnull_attribute__ (1) internal_function;
 
+/* Find the split (or skeleton) unit.  */
+extern struct Dwarf_CU *__libdw_find_split_unit (Dwarf_CU *cu);
+
 /* Get abbreviation with given code.  */
 extern Dwarf_Abbrev *__libdw_findabbrev (struct Dwarf_CU *cu,
 					 unsigned int code)
@@ -972,6 +981,9 @@ str_offsets_base_off (Dwarf *dbg, Dwarf_CU *cu)
 	      cu->str_off_base = 0;
 	      return cu->str_off_base;
 	    }
+
+	  if (dbg == NULL)
+	    dbg = cu->dbg;
 	}
       else
 	return cu->str_off_base;
@@ -1051,7 +1063,7 @@ static inline Dwarf_Off __libdw_cu_str_off_base (Dwarf_CU *cu)
    constructed NULL is returned.
 
    The caller is responsible for freeing the result if not NULL.  */
-char * filepath (int fd, const char *dir, const char *file)
+char * __libdw_filepath (int fd, const char *dir, const char *file)
   internal_function;
 
 
diff --git a/libdw/libdw_find_split_unit.c b/libdw/libdw_find_split_unit.c
new file mode 100644
index 0000000..0f74b39
--- /dev/null
+++ b/libdw/libdw_find_split_unit.c
@@ -0,0 +1,118 @@
+/* Find the split (or skeleton) unit for a given unit.
+   Copyright (C) 2018 Red Hat, Inc.
+   This file is part of elfutils.
+
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of either
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version
+
+   or both in parallel, as here.
+
+   elfutils is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "libdwP.h"
+#include "libelfP.h"
+
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+
+Dwarf_CU *
+internal_function
+__libdw_find_split_unit (Dwarf_CU *cu)
+{
+  /* Only try once.  */
+  if (cu->split != (Dwarf_CU *) -1)
+    return cu->split;
+
+  /* We need a skeleton unit with a comp_dir and [GNU_]dwo_name attributes.
+     The split unit will be the first in the dwo file and should have the
+     same id as the skeleton.  */
+  if (cu->unit_type == DW_UT_skeleton)
+    {
+      Dwarf_Die cudie = CUDIE (cu);
+      Dwarf_Attribute compdir, dwo_name;
+      /* It is fine if compdir doesn't exists, but then dwo_name needs
+	 to be an absolute path.  Also try relative path first.  */
+      dwarf_attr (&cudie, DW_AT_comp_dir, &compdir);
+	if (dwarf_attr (&cudie, DW_AT_dwo_name, &dwo_name) != NULL
+	    || dwarf_attr (&cudie, DW_AT_GNU_dwo_name, &dwo_name) != NULL)
+	{
+	  const char *comp_dir = dwarf_formstring (&compdir);
+	  const char *dwo_file = dwarf_formstring (&dwo_name);
+	  int fd = cu->dbg->elf->fildes;
+	  char *dwo_path = __libdw_filepath (fd, NULL, dwo_file);
+	  if (dwo_path == NULL && comp_dir != NULL)
+	    dwo_path = __libdw_filepath (fd, comp_dir, dwo_file);
+	  if (dwo_path != NULL)
+	    {
+	      int split_fd = open (dwo_path, O_RDONLY);
+	      if (split_fd != -1)
+		{
+		  Dwarf *split_dwarf = dwarf_begin (split_fd, DWARF_C_READ);
+		  if (split_dwarf != NULL)
+		    {
+		      Dwarf_CU *split = NULL;
+		      while (dwarf_get_units (split_dwarf, split, &split,
+					      NULL, NULL, NULL, NULL) == 0)
+			{
+			  if (split->unit_type == DW_UT_split_compile
+			      && cu->unit_id8 == split->unit_id8)
+			    {
+			      /* Link skeleton and split compule units.  */
+			      cu->split = split;
+			      split->split = cu;
+
+			      /* We have everything we need from this
+				 ELF file.  And we are going to close
+				 the fd to not run out of file
+				 descriptors.  */
+			      elf_cntl (split_dwarf->elf, ELF_C_FDDONE);
+			      break;
+			    }
+
+			  if (cu->split == (Dwarf_CU *) -1)
+			    dwarf_end (split_dwarf);
+			}
+		      /* Always close, because we don't want to run
+			 out of file descriptors.  See also the
+			 elf_fcntl ELF_C_FDDONE call above.  */
+		    }
+		  close (split_fd);
+		}
+	      free (dwo_path);
+	    }
+	}
+    }
+
+  /* If we found nothing, make sure we don't try again.  */
+  if (cu->split == (Dwarf_CU *) -1)
+    cu->split = NULL;
+
+  return cu->split;
+}
diff --git a/libdw/libdw_findcu.c b/libdw/libdw_findcu.c
index 0a65c97..d6975f3 100644
--- a/libdw/libdw_findcu.c
+++ b/libdw/libdw_findcu.c
@@ -116,6 +116,7 @@ __libdw_intern_next_unit (Dwarf *dbg, bool debug_types)
   newp->orig_abbrev_offset = newp->last_abbrev_offset = abbrev_offset;
   newp->lines = NULL;
   newp->locs = NULL;
+  newp->split = (Dwarf_CU *) -1;
   newp->base_address = (Dwarf_Addr) -1;
   newp->addr_base = (Dwarf_Off) -1;
   newp->str_off_base = (Dwarf_Off) -1;
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 16011c8..b865ad5 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,23 @@
+2018-05-16  Mark Wielaard  <mark@klomp.org>
+
+	* Makefile.am (check_PROGRAMS): Add get-units-split.
+	(TESTS): Add run-get-units-split.sh.
+	(EXTRA_DIST): Add run-get-units-split.sh, testfile-hello4.dwo.bz2,
+	testfile-hello5.dwo.bz2, testfile-splitdwarf-4.bz2,
+	testfile-splitdwarf-5.bz2, testfile-world5.dwo.bz2 and
+	testfile-world4.dwo.bz2.
+	(get_units_split_LDADD): New variable.
+	* get-units-split.c: New test.
+	* run-get-units-split.sh: New test runner.
+	* testfile-dwarf-45.source: Extend with build instructions for new
+	test files.
+	* testfile-hello4.dwo.bz2: New test file.
+	* testfile-hello5.dwo.bz2: Likewise.
+	* testfile-splitdwarf-4.bz2: Likewise.
+	* testfile-splitdwarf-5.bz2: Likewise.
+	* testfile-world5.dwo.bz2 and: Likewise.
+	* testfile-world4.dwo.bz2: Likewise.
+
 2018-05-09  Mark Wielaard  <mark@klomp.org>
 
 	* run-readelf-zdebug.sh: Adjust test output for new header layout.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ac16a5e..07165d8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -56,7 +56,7 @@ check_PROGRAMS = arextract arsymtest newfile saridx scnnames sectiondump \
 		  elfshphehdr elfstrmerge dwelfgnucompressed elfgetchdr \
 		  elfgetzdata elfputzdata zstrptr emptyfile vendorelf \
 		  fillfile dwarf_default_lower_bound dwarf-die-addr-die \
-		  get-units-invalid
+		  get-units-invalid get-units-split
 
 asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
 	    asm-tst6 asm-tst7 asm-tst8 asm-tst9
@@ -140,7 +140,7 @@ TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile test-nlist \
 	run-readelf-zdebug.sh run-readelf-zdebug-rel.sh \
 	emptyfile vendorelf fillfile dwarf_default_lower_bound \
 	run-dwarf-die-addr-die.sh \
-	run-get-units-invalid.sh
+	run-get-units-invalid.sh run-get-units-split.sh
 
 if !BIARCH
 export ELFUTILS_DISABLE_BIARCH = 1
@@ -361,7 +361,10 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh run-ar.sh \
 	     testfile-bpf-dis1.expect.bz2 testfile-bpf-dis1.o.bz2 \
 	     testfile-m68k-core.bz2 testfile-m68k.bz2 testfile-m68k-s.bz2 \
 	     run-dwarf-die-addr-die.sh \
-	     run-get-units-invalid.sh
+	     run-get-units-invalid.sh run-get-units-split.sh \
+	     testfile-hello4.dwo.bz2 testfile-hello5.dwo.bz2 \
+	     testfile-splitdwarf-4.bz2 testfile-splitdwarf-5.bz2 \
+	     testfile-world5.dwo.bz2 testfile-world4.dwo.bz2
 
 if USE_VALGRIND
 valgrind_cmd='valgrind -q --leak-check=full --error-exitcode=1'
@@ -521,6 +524,7 @@ fillfile_LDADD = $(libelf)
 dwarf_default_lower_bound_LDADD = $(libdw)
 dwarf_die_addr_die_LDADD = $(libdw)
 get_units_invalid_LDADD = $(libdw)
+get_units_split_LDADD = $(libdw)
 
 # We want to test the libelf header against the system elf.h header.
 # Don't include any -I CPPFLAGS.
diff --git a/tests/get-units-split.c b/tests/get-units-split.c
new file mode 100644
index 0000000..410483a
--- /dev/null
+++ b/tests/get-units-split.c
@@ -0,0 +1,101 @@
+/* Test dwarf_get_units finds split DWO CUs.
+   Copyright (C) 2018 Red Hat, Inc.
+   This file is part of elfutils.
+
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   elfutils is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <dwarf.h>
+#include ELFUTILS_HEADER(dw)
+#include <stdio.h>
+#include <inttypes.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+
+int
+main (int argc, char *argv[])
+{
+  for (int i = 1; i < argc; i++)
+    {
+      printf ("file: %s\n", argv[i]);
+      int fd = open (argv[i], O_RDONLY);
+      Dwarf *dbg = dwarf_begin (fd, DWARF_C_READ);
+      if (dbg == NULL)
+	{
+	  printf ("%s not usable: %s\n", argv[i], dwarf_errmsg (-1));
+	  return -1;
+	}
+
+      Dwarf_CU *cu = NULL;
+      Dwarf_Die cudie, subdie;
+      uint8_t unit_type;
+      int count = 0;
+      while (dwarf_get_units (dbg, cu, &cu, NULL,
+			      &unit_type, &cudie, &subdie) == 0)
+	{
+	  count++;
+	  printf ("Got cudie unit_type: %" PRIx8 "\n", unit_type);
+
+	  if (unit_type == DW_UT_skeleton)
+	    {
+	      Dwarf_CU *skel_cu = cudie.cu;
+	      Dwarf_CU *split_cu = subdie.cu;
+	      Dwarf_Die skel_die, split_die;
+	      uint64_t skel_id, split_id;
+
+	      printf ("Found a skeleton unit, with split die: %s\n",
+		      dwarf_diename (&subdie));
+
+	      if (dwarf_cu_die (skel_cu, &skel_die, NULL, NULL, NULL, NULL,
+				&skel_id, NULL) == NULL)
+		{
+		  printf ("bad skel_cu: %s\n", dwarf_errmsg (-1));
+		  return -1;
+		}
+
+	      if (dwarf_cu_die (split_cu, &split_die, NULL, NULL, NULL, NULL,
+				&split_id, NULL) == NULL)
+		{
+		  printf ("bad skel_cu: %s\n", dwarf_errmsg (-1));
+		  return -1;
+		}
+
+	      if (skel_id != split_id)
+		{
+		  printf ("Skeleton id and Split id not equal!\n");
+		  return -1;
+		}
+	    }
+	}
+
+      if (count == 0)
+	{
+	  printf ("No units found\n");
+	  return -1;
+	}
+
+      dwarf_end (dbg);
+      close (fd);
+
+      printf ("\n");
+    }
+
+  return 0;
+}
diff --git a/tests/run-get-units-split.sh b/tests/run-get-units-split.sh
new file mode 100755
index 0000000..7b13694
--- /dev/null
+++ b/tests/run-get-units-split.sh
@@ -0,0 +1,65 @@
+#! /bin/sh
+# Copyright (C) 2018 Red Hat, Inc.
+# This file is part of elfutils.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# elfutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+. $srcdir/test-subr.sh
+
+# See run-typeiter.sh
+testfiles testfile-debug-types
+
+testrun ${abs_builddir}/get-units-split testfile-debug-types
+
+# see run-readelf-dwz-multi.sh
+testfiles testfile_multi_main testfile_multi.dwz
+
+testrun ${abs_builddir}/get-units-split testfile_multi_main
+
+# see tests/run-dwflsyms.sh
+testfiles testfilebazdbgppc64.debug
+
+testrun ${abs_builddir}/get-units-split testfilebazdbgppc64.debug
+
+# see tests/testfile-dwarf-45.source
+testfiles testfile-dwarf-4 testfile-dwarf-5
+testfiles testfile-splitdwarf-4 testfile-hello4.dwo testfile-world4.dwo
+testfiles testfile-splitdwarf-5 testfile-hello5.dwo testfile-world5.dwo
+
+testrun ${abs_builddir}/get-units-split testfile-dwarf-4
+testrun ${abs_builddir}/get-units-split testfile-dwarf-5
+
+# These two files are the only ones that actually have skeleton units.
+testrun_compare ${abs_builddir}/get-units-split testfile-splitdwarf-4 << \EOF
+file: testfile-splitdwarf-4
+Got cudie unit_type: 4
+Found a skeleton unit, with split die: hello.c
+Got cudie unit_type: 4
+Found a skeleton unit, with split die: world.c
+
+EOF
+
+testrun_compare ${abs_builddir}/get-units-split testfile-splitdwarf-5 << \EOF
+file: testfile-splitdwarf-5
+Got cudie unit_type: 4
+Found a skeleton unit, with split die: hello.c
+Got cudie unit_type: 4
+Found a skeleton unit, with split die: world.c
+
+EOF
+
+# Self test
+testrun_on_self ${abs_builddir}/get-units-split
+
+exit 0
diff --git a/tests/testfile-dwarf-45.source b/tests/testfile-dwarf-45.source
index c9c4446..584c8f7 100644
--- a/tests/testfile-dwarf-45.source
+++ b/tests/testfile-dwarf-45.source
@@ -79,3 +79,11 @@ $ gcc -o testfile-dwarf-4 hello.o world.o
 $ gcc -gdwarf-5 -gno-as-loc-support -gno-variable-location-views -O2 -c world.c
 $ gcc -gdwarf-5 -gno-as-loc-support -gno-variable-location-views -O2 -c hello.c
 $ gcc -o testfile-dwarf-5 hello.o world.o
+
+$ gcc -gdwarf-4 -gsplit-dwarf -gno-as-loc-support -gno-variable-location-views -O2 -o testfile-world4.o -c world.c
+$ gcc -gdwarf-4 -gsplit-dwarf -gno-as-loc-support -gno-variable-location-views -O2 -o testfile-hello4.o -c hello.c
+$ gcc -o testfile-splitdwarf-4 testfile-hello4.o testfile-world4.o
+
+$ gcc -gdwarf-5 -gsplit-dwarf -gno-as-loc-support -gno-variable-location-views -O2 -o testfile-world5.o -c world.c
+$ gcc -gdwarf-5 -gsplit-dwarf -gno-as-loc-support -gno-variable-location-views -O2 -o testfile-hello5.o -c hello.c
+$ gcc -o testfile-splitdwarf-5 testfile-hello5.o testfile-world5.o
diff --git a/tests/testfile-hello4.dwo.bz2 b/tests/testfile-hello4.dwo.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..fe02d65cd5489804d9dc76d82b5e9f365c1b71a3
GIT binary patch
literal 1453
zcmV;e1ycG#T4*^jL0KkKS-}ChCjbIG|NsC0|Nj5~|NsC0-~a#r|L_0(|97AN|Nno#
z|NsC0|NqbfUIH}7H%N@8O-9l^Cy5&*+6JT4@{dvKdV%FMHls{H+J~v?X`?{X(@@Z8
zX`@D(GB&5CqfCZ_G}33PdPk^eJtGrhXpbcIG}F+JDe7$18fK^Jo}<ML4@t5@6KY@$
z5r9k+OaK6CZ6;(1lO_O|0iX$!0i=2~(?FX-dIqK@n9u`3Fvyqy34jE_qGDmGfJ_+*
zq%;5k00003KmgDH00000000wA34j0rpa1{>000001TX~2f&c-a0B8UJGynhq0004?
z00000GyrG-00000001-q01W^D289TdC#R`4MAJh?O&&zVX`s_;2ATlS01S+pFq$;e
zBSSzL2ATi>27mwtfCE4p8UO$TMoj?FU`EHJIfg7)s0~1(pV_JBrB|pS0LhRUa7uVj
z+aWbzn^*ws%^g9aGiBA7TtD2VVWe<0%yP!LfKPA8L{nxe)uaG`Y;XqN`4<|flJ}ti
z=3oFqT)_(KqF<hp48TJKMr1^0W@bRE&*(skKCvud7^td6CU36*Q`prXGXaeD9YK;f
zm<Llhbwh(?n}=f{urq>Sv8WHxWKb~ktntTKgp9gT9kjrmK4FN=iWS}vf)PrY6$!*Z
zwopXt^PaO*RW8`tWp0O05S4vmH82~{Agu8aX3Q`+O!5ptfHfurb~%ER<{?=5zW644
ze`5WpsY-TRBab>Y&}t~r-5kX~0BhB1{&if(Y2fN*BlA=3Ec7*mp7e~9n$t-v#)VxO
z8;I@JK`UbnbiQ_FOooPqjJD_UIW`4g#Y~T&2pYF(ZK<+2@t3#sYI{1t#XHD|c$fW-
z=lyI3)vqHCLoQB5An+fT2^Myulv3CLCCx9|Qb7qB9Dqo+I38gNK)x>xm}uLtiG_#8
zIbO6PGF-^;jo;{z;O}!vhv$=5DqMaLnyWCO_{-yMmi)EM`9>(~3g}48uA%^sjbL*W
z{^eTFY^9t!Cl`bOgGn%=rU|`^u;B#V1(u~Te-<bw0#R!DhdztPM7owyQ^kvcShhs<
zp`<c-N4(m5WA*U?uJ#f!X(+&2?|CiuwEB0CO~k^S013eW5D_+<2|P38sXaQRQ(9dy
zVHzVVz$!_}XX*Ks#L7F3r>C~~^CjGP%B~9-V7AEOx)C;=5bv#Jo>z8qcUMClQUyyc
z6=pb4q0)kqGIKQIa43@+CEi=m&itGpoLrhIQws%FduZ3_<;s<W0tE7vx*$$(hD)z0
zA;`SDw)aKBh+`e#>xLm$NRLnp$p9EA6rPHR($f*Zx)=ctM~lh86D(71lt8+93qQs=
zKyU=H5Rt-okq!V(dQC|7700%A3Rx5Gr6)GcbXSH&EC2+9vkTV33bCD3iiPVxZv)To
znGOTu)(pM5V_-1Yhtn4?c03qq_0y}<#*3MoBd{|==+ap=Kq|&gWbnqlTo|Q%_T-Dx
z$(x~KPLK!BAyr^3xVo5NDayWfz;5hLR7;|R39!Y1hp1e!?F7%>$F^2P?I--o_-R~m
zPJ&xrN)Ylzkk-%^gr290{x`zpW?aXVY+mM|9kv=s^wdmqmDjE+sILLkowz(|+;>_9
z^wEURh~TM5_h=9|bIuI9vSmoBF&i?2E=e1FsGouIg|)9IUIIZTb&eqqg%{oA7qy$8
zQbqKsrZS%?)S3f_U{1lm*;V(CgYck>Cq8l4bfJ#NgT{So0`9bqXaEbSj)6ZA!D#zh
zt08d?N|}olhFXP^Q_Z#-1Bzg2J@@pv1lte=wV1J1LxoPzh5wdpn=<YI&>W&mY7Ln&
zg(Y`J^~n%&{BRU8N`YUIEHo3F{kY8v_U3X?4oA_*M;VZ~ZB)`1^c3LIzwvh@Q-ui(
H5F3(ko7IvT

literal 0
HcmV?d00001

diff --git a/tests/testfile-hello5.dwo.bz2 b/tests/testfile-hello5.dwo.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..e911375ef24fdf29d83103a66132b41b08822089
GIT binary patch
literal 1520
zcmV<M1rPc{T4*^jL0KkKS-YC{5&!}*|NsC0{onup|NsC0|NsC0|L_0*|NsC0|NsC0
z{r~^(|NqbfUITl*p6kcEHH@k1Vqi@)G{6ahV3+_V(WGH84NMv)00001FbRR60003n
zXcJ5m00h%aG5`|+JxA&TCZ+=-k5kkPnjWLm8lyppnwc>S5cM{o#0;LNq}rJ_rjOM&
zNb~`cZ4*pPAkZ{=O_VTtrk;u928}}+8VF?c8kwZiOlSneGBh$XO%9%*022UA0$?-%
zOaK6w27m^D0F5vJ&;STv4JH5p000000$^yEnr#380O_MCnhgyQHi?FUVH!M|1lmj{
z27sP{H1q-uFaV4uhG+?Z27mwn(lRhK0iX${00009=o%0jA|z!SN$E887)F{sO+8FN
zG(91N05lp8Pyo=-G-;p)gC^8^ngOPO13&-(2c!TR8Z>APGz}i6fEobM$U~S|s;NpA
zD5v*#CAfWBxqGP)O(cYvB+nfFTXNGpr~!a^c}O(8yG`WnY}!d*BdD0KG9dj`Kp-KE
zJ-?uV0RV6&(k}CUjiFcw08Ynqd_XfGMqq$5GcyEGPzWLguQ8Z?kT47-jLHDRF(DQE
zP>Vqph~^C548`?bnXidi3K*FMLBS}NyfhGup+??K1QKE*K3OFXS0I8B23@nO855Iw
zmquLK%eSDaL9CcD-{)Q6)D%ai)ySyjSR)~IsGxrgIyRI@Rh1gm7P}x<>QkNx=@`Xb
z2n6B~3XwR~q;vYV<vot1A6YGPF*NVjaSXVF4-~Y{L$hsi;staexO@4xwIx;ThAZB`
zNNgOquRx_5$aw#wD@1WgrIS29jf4u$*Bm5p;X@+$)OnWKky1emWA<rsKBJ(+gvgac
z&fJyAqY^jVK-FWtfVgX#JUGP?fCZoZ?G3;e0TpU!2EZ5w|0?{cBT%=<JFH;tU$RZD
z;;{<>R5Hb%K?)4&vjd?E{Pv+ZnHHNOxdUe+;0V9^0k(}!dT58VlqU>Dt&li|7c>wq
z_^|}SIgqS`PXf5;Iyn2(vUxGMjlOTb>8?UmF?uj!1Mvr%Hj_QL;qXM=xL7`Ep0|`t
zBABty{l^$mPWJfNFd7dd0*x$u6y5OkWIB>r;R)(!Wx5ihh7(l?DiK`ZuULRVs0nVh
z{?`T7n*=~kC-wvtOt)x_OahcxaRvay9CN&DCxC8Zw-nnB+E8yXaFL}d%cN6hcw7p*
zwveOH)7(ygQoebtjQA;Pfr#<GGI0sJ;CLTo*!jejgGNKT@a!OwVTb+DEO({=D5eO)
z(Rwx{Yaj*TM_KEDR1BV-?U??D-wQP|)uZz_>h&=KAi!Y@d-zhuNk_xK&e(&eMkRR*
zM13d}%*R8#C|Kv$AOsUB_|NbN0eIQbw8-}@cz!?TVehE;0hp$M93(=rx}s10@FcCl
zww6e~DX8N=D2wNp4VJHhf3eLwv3DyJFcmmIx73HfMYD~BT9#jl9~-zc8UtTuFYL&}
zQ-vaXDF=6ea}>4!F=Z4HHZ-~@jl7|SINS8(9a9yf3Xwp0bJ1M2-K?8ZtVk`O0X2Z$
z6#>^IB`1z6883I1=}#bZx)}$GfI!OggK35eBjP|D(My17@CPMoFu})6!4Pp6)b;XK
z(<Z%<2WKdJX)dWxCk8g>yta8<c4qn!NdhBHTbI1!^u2RHzDE^(GZVa&`Q{ZM%Rs)C
zXoaJ56QZwkidY(10PR7xVJDpL`R$)CKD(w_28&SOB=<c<CDzMyGWAI*PGYmK{?sDR
zhAy?bNSv;uGgVS!k|o<#qi1r>Gg+$&7u4qF{I1xLC$iS*P32kzd&sFRSNnf8?FEhX
z2(H8=XOBVi4m>TQ_p3r+2`^_aIy7i_wZQmYVd-Z<HJGYHBC;k%j-^qU>j3m@Y3z+A
zO@)FbY0BlI$Cv6Z8zh8ow-V!F66ymI=r{vBUf}|URl~Y@z6|R>p<grNjLN|Nfh*f+
W$eLG#0#<AX?-z1KI8czgn)VXAX{Cz*

literal 0
HcmV?d00001

diff --git a/tests/testfile-splitdwarf-4.bz2 b/tests/testfile-splitdwarf-4.bz2
new file mode 100755
index 0000000000000000000000000000000000000000..a1871e619e19a282a9b485f0202395e81f6202a0
GIT binary patch
literal 3591
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
N7ji{7P>|1){4}S(bT|M2

literal 0
HcmV?d00001

diff --git a/tests/testfile-splitdwarf-5.bz2 b/tests/testfile-splitdwarf-5.bz2
new file mode 100755
index 0000000000000000000000000000000000000000..27ff3bd6cdef305941dabc51f503950fdaead28c
GIT binary patch
literal 3611
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

literal 0
HcmV?d00001

diff --git a/tests/testfile-world4.dwo.bz2 b/tests/testfile-world4.dwo.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..297fe5fa9c5df6db885cdcb73d4b5bd4057f8c66
GIT binary patch
literal 1444
zcmV;V1zY+;T4*^jL0KkKS)pE7i~s^WfB*mg|NpOl|Nnpg|NsB@|NsC0|NsC0{{P?q
z@Bjb*|NqbfUITAly~ld?)*zSx>I{uNNv6;UzyO+QfshH4MhWN<fD=tU0vH28m<EJ1
z)P{xtCIAyd3FtJ^FljM8Mw=u*PywP~I!B-YPeCvM011Eq4FCWD002EhKr}r-0yNr8
z0000Z000000iXa(nJ^K7lr(4n011hc0001J(J%ne000dD0GI#}Vrhd@000000004?
z012i7X^ffzl#Kw$nTmR9ZA~^QngV3PG++X0qb8UDA({lx84Li8sffvjrV|<?MhyWp
z$kDYLX@CF#ntEzuP}4`CCQJ=ABs3}NdWPDjKn9HfXwcBpN2CUTG5~smL7)MU+L{0W
z8UO*HG|&S;05k!h&>8?}004S`AVx;1*+tqSf`MN;&QgZW$v_-910E4)$HyUSw`AFX
z7=Bdn6)F02+r!R<k?lUSaE)mcT$Bk#rKloX$e>ZwfdGRsJT~tyOz;O0l+o%W_WT9H
zFhM9003?zK7?Ob?-_-I2Rbm2)A`%e^B$<)|RbdnW5=0>Vm?xwH6y(!L0}4V>fPYX(
zVgpP4$+IDQJt8V$(b+a~v#`NHxH1Z-VDQwaS;KO;GgAJxPRw3nVXUvI;^8C60$cGO
zw)Y66yF?&R667FtHtIQ$fuT&gg=Q|Vpcdbhn3IfI!2((Gnv{~uDPt<SlUJsOn|lz}
zw8LaXEmaaEXTV245r^P7;KEb(Fi?ynEIGkchK2%lsJhFUcF*+q8mI%@mW@!a{DLNZ
z1Ynt~<6uW-A7WSr?c@8r1$N}fpI;koy{7rHA~-Gd&Q1~oe<O*l+MWw+{%a&Hs{C>L
z>6C~otzWbEzQ&p9j&*~pKmS^SG_sHb@-Ag#m`qQB5EN*zM^7F!MUlElYOIMMDZyCn
z(cO^$0%3jm2%?9?TrX;;&}1WQ7^UxrhnR?~F`lXzpi}&}CAA3|Ueeeo8VQh8O@6y&
z`>+Ondhn#FOEV^tRp<74PP0ouq%l9KTqNp(d1y{<2bviOM-eak_V3ECqkTUvDOf<P
zT9pyCn*qER0vm&}EeO$~Puhk(Bd%C2gjJfnA`%F0WkwVO1!Z1n2;w};ce$aLFFzN>
zOv>pKqVBB~1QV$NVw8mN+21kZ-gTRV^01&7tVp3k(NKUMqOo#9O><cK!^J6%jZR7c
zTSkH)#p0=<rys?)_K9VPSI&H7v+4VNUP6Tt(}f@tNaBwyZFnNnKoV&k!2*Q5-OCeQ
z;d|P3EEkkSFf5<|%W<?3+-0IX5OBnT0$v7O=}>wG1O-SDge3?-0a`j(Vm_9F$O4*R
z<9Go=GLZi&IWcN$DGND-jX!0B9I+H^06rj38iWn_WqcIt&M=LRuvhYbf;_bnfX<?n
zY&gJzS}>#q_|E=8lr;b<DK=FwZd260Vhb;UnfQf}eWMihz*r4e=ozvFff$nFm&#}$
z@H1kj|2^-->tZg8P)~`QVqJg$ut+Y+!1?{fV40cF+0m8!MXp7yiwi~-gVb5yYcie8
zn0iMf-hwX6212zM4E2I)933mmJEF2#W=wq)zxc01;%lE~X?4hscl&0|C1HP7bz$~u
zxE=!ttzQ{`BYtDZ`&02t`VNPHLKNC|16$A-LUF|_JJE|gb4@p>6v|@Lyh*3`>WbzP
z<v))+mLR$19>Y1h?Exk&XeeY_6v#n~K9z;Q_~DJ$d;NpuIQ;>73!%K6fKWEYtx5pS
z=d1q;;x#pV>U#enDeOPXl%$)rCy+RgBZ&v&IYilEx*iMSB(jzkvW!oN0(!x?ZpQ{#
yZV8ada^pdc@^fvXsGJX>*DAidw3LDg7`%<;W4^1+ra49)ad#wBg$W83<%qxn3xQJr

literal 0
HcmV?d00001

diff --git a/tests/testfile-world5.dwo.bz2 b/tests/testfile-world5.dwo.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..d5c852c38776422291e8db2136f3198dfec16f44
GIT binary patch
literal 1498
zcmV<01tt1IT4*^jL0KkKSuLLU{{RAL|NsC0|NsC0|NH;{|NsC0|NH;{|Ns5>|Nejf
z|Ns2^|G&@!ec@HzUcAl73Z|n|PgB%+FsF(#dQCj0Pbs09O$`U6@{EA=jUJ{z(TVD4
z@gve6pz@nY4K&f}XgxzU00U^$)4@hT>OD=U@`tIXsj)*r>S>APH1!%i5dA20Vj7t<
z(i#9734j0zvW92@GB5*1ngE!drquN?C!hc{X)s0tWMMD>007j$m_`6h1k(|K3W-kz
zGe%R|Mw%lgj5H=RPg74xrU240Fal|S1j(jD5Yd8U!7((*(<4nV02(F$00A;GF*16Y
zF*cJ4h{VAOGD2jY)ZVBF(THfoX_E*8N2oG185uM(VAR4IG%{jnWDN{PfM{p{G-${e
znlPA{CPPgOnE(JXX`?_GqLlP%ZBJ348ZrPqAO_R`002Ee4FL5301r{>8UO$Q00000
z0000000w{n0RS=N6v(1cAyX97ccfJ!0-%Ln9e@qlu6?^{I5~8{0FWHz0ya|fzk{Q_
zcXzDXrI;k~0%GS7T1dCdFzpeOMi3A25*b6Mwz&S+0ru0K-1Er%;sKW=fFuMGNdyu|
z!DbnZAjKz>mOe$wY621fv24N@kifzNLP(?{lhBA1SmqD_jf8+h9MB?B0v!wLVL*nz
ze+=Nq`&c84GNynU6p9%KwJ*!GT5U{f+sa82@FWZQP~{s6bU?2iObVB#a}SgE&~s#9
z={hR`jZuNy(5B8icUA)yj6IVi(;rha#2Q%cq|(%Cp$G^>CrGmqgA9U_F||EEE}nln
zhJpYV**!^{Y>*XU(Qx?~#1L9=ttg?SqA0mibpl1tvTu)aK#hFBI7s5{-xw^b{i0|~
zAnAn=?Sd5P!44f^AoP=`>I55$KA$A;&OI*{nn3hCpT~qLzmTV!;U9|jBq7NVgG)~v
zU-(7JUXEhK=X+3tpCmyQWlDTOf&@$BG0k!QBrHXh9{wW5-RY>S$$kt;%XicrOQ=1N
z3IK*j$=esl1R!Dy&y^xD%rFLFwzlXskjc`b2%8kox+t{>8BQbO%A{C7eh-F+1(-l9
zKK-Iy-JI4yRWnF{Io^3j4v7gr!qp0Cs4U#=&%fzEZs3vqmkJw68%`qb;Mqb)GtS>N
zlOvH7wzN>F=ImjPie7QG<YAh*z)oM4I;=1dmCQ9vZ6urwiu#`eU_Qt|1qebK{AH_O
zGUE*x*;DJE2)kY#Yk_zb+cT<4mp}kg1O&+}g*`F@q8^i~9Yc!j@t9ozSb*)hsVbno
zoj3}@0MN!LJ@BAC?y`v#mhx6A$*iVW1FX`;zC1DpzXrs3&!V<8P-`c_+eYnd&be9u
z*3zqDRr0qPJeo}~@X--;Dn!k8rf>p0T%L$xD2)fHBly?5lr1nY%`27wupx#L2_*9z
zlyLwc&RQt0>4DUVU^GyI1}_)^5H+k!r~)1*<#c(n?&=^2OAc@CaM{8EW}bk@E?cI=
zlk<9uGrF!KLEi%s89+t|2>l*~W&YsT>*mF)rhD<U^I^=#JB_Rrbst3dTL*`-U555R
zI)e~av^`e&r*GI~KUlx>fjOAYNK(YkAB?5AxyX$q{$n*C(cMvvxeu@+GwXO<Cj2)a
zr%fx`Qjka$z{d>cQ?(wfa<;(c`&?cNlSp_bXF#CYN+I$5oaAyofOy3^UoteYS;Lu<
z&kd4=IXk5uzBO&0Zose+e5%Sm4KDY=_)xtm*ah%`_T(P!K`uMV2^LKXzg}U42He#v
za{77`CK2nA&es(aDQr7D)p<ET-1fHYjWmDt<4I*x$|Ehq%PFaxbjBG*QOG6_Ig9+L
zz%rv48aQ^sWL6f1eWZ(7)0-4n!>UDSTtcrO3`==hx>eQ`RP*~B909j6QnUurCR+|;
zR{u3sP)zVsBd<M$F{j(|tVSDyC2-oQyMsVTo<jBI+?uKS_8;+gBvXY60@?46@Q;I|
A6#xJL

literal 0
HcmV?d00001

-- 
1.8.3.1

Re: [PATCH] libdw: dwarf_get_units find split units from .dwo.

[Mark Wielaard]

On Wed, May 16, 2018 at 09:15:01PM +0200, Mark Wielaard wrote:
> For a skeleton DIE dwarf_get_units should provide the split DIE as subdie.
> This implements that by trying to find the (named) .dwo file and finding
> the matching CU in it. The .dwo file is search relative to the current
> DWARF or using the comp_dir of the skeleton DIE.
> 
> Also fixes a small issue with str_offsets_base_off which is tested in the
> new testcase (by getting the name of the split CU DIE).

Pushed to master.