[llvm] 62d6ff5 - [dsymutil] Track incompleteness across unions

[Jonas Devlieghere via llvm-commits]

Author: Jonas Devlieghere
Date: 2021-09-24T14:26:37-07:00
New Revision: 62d6ff5e9e70dd11a4e9e6efc48ce174cd6849bd

URL: https://github.com/llvm/llvm-project/commit/62d6ff5e9e70dd11a4e9e6efc48ce174cd6849bd
DIFF: https://github.com/llvm/llvm-project/commit/62d6ff5e9e70dd11a4e9e6efc48ce174cd6849bd.diff

LOG: [dsymutil] Track incompleteness across unions

When determining the incompleteness of a DIE based on its children, make
sure we propagate it across union types. See test case for an example.
Without this patch we never emit the definition of Container_ivars.

Differential revision: https://reviews.llvm.org/D110443

Added: 
    llvm/test/tools/dsymutil/Inputs/private/tmp/union/a.out
    llvm/test/tools/dsymutil/Inputs/private/tmp/union/container.o
    llvm/test/tools/dsymutil/Inputs/private/tmp/union/use.o
    llvm/test/tools/dsymutil/X86/union-fwd-decl.test

Modified: 
    llvm/lib/DWARFLinker/DWARFLinker.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/DWARFLinker/DWARFLinker.cpp b/llvm/lib/DWARFLinker/DWARFLinker.cpp
index 4449cd8ef5553..a3dec6c25e445 100644
--- a/llvm/lib/DWARFLinker/DWARFLinker.cpp
+++ b/llvm/lib/DWARFLinker/DWARFLinker.cpp
@@ -549,6 +549,7 @@ static void updateChildIncompleteness(const DWARFDie &Die, CompileUnit &CU,
   switch (Die.getTag()) {
   case dwarf::DW_TAG_structure_type:
   case dwarf::DW_TAG_class_type:
+  case dwarf::DW_TAG_union_type:
     break;
   default:
     return;

diff  --git a/llvm/test/tools/dsymutil/Inputs/private/tmp/union/a.out b/llvm/test/tools/dsymutil/Inputs/private/tmp/union/a.out
new file mode 100755
index 0000000000000..12455687df335
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/private/tmp/union/a.out 
diff er

diff  --git a/llvm/test/tools/dsymutil/Inputs/private/tmp/union/container.o b/llvm/test/tools/dsymutil/Inputs/private/tmp/union/container.o
new file mode 100644
index 0000000000000..6ca18787e9e24
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/private/tmp/union/container.o 
diff er

diff  --git a/llvm/test/tools/dsymutil/Inputs/private/tmp/union/use.o b/llvm/test/tools/dsymutil/Inputs/private/tmp/union/use.o
new file mode 100644
index 0000000000000..00ceadc8776a5
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/private/tmp/union/use.o 
diff er

diff  --git a/llvm/test/tools/dsymutil/X86/union-fwd-decl.test b/llvm/test/tools/dsymutil/X86/union-fwd-decl.test
new file mode 100644
index 0000000000000..e738ab2e3d998
--- /dev/null
+++ b/llvm/test/tools/dsymutil/X86/union-fwd-decl.test
@@ -0,0 +1,61 @@
+Test binaries created with the following commands:
+
+$ cat container.cpp
+#include "container.h"
+#include <stdlib.h>
+
+struct Container_ivars {
+  // real definition here
+};
+
+ContainerPtr allocateContainer() {
+  Container *c = (Container *)malloc(sizeof(Container));
+  c->ivars = (Container_ivars *)malloc(sizeof(Container_ivars));
+  return c;
+}
+
+extern void doSomething(ContainerPtr);
+
+int main() {
+  ContainerPtr c = allocateContainer();
+  doSomething(c);
+  return 0;
+}
+
+$ cat container.h
+struct Container_ivars;
+
+struct Container {
+  union {
+    struct Container_ivars *ivars;
+  };
+};
+
+typedef Container *ContainerPtr;
+
+$ cat use.cpp
+#include "container.h"
+
+void doSomething(ContainerPtr c) {}
+
+
+$ clang++ -O0 -g container.cpp -c -o container.o
+$ clang++ -O0 -g use.cpp -c -o use.o
+$ clang++ use.o container.o -o a.out
+
+Note that the link order in the last command matters for this test.
+
+RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/union/a.out -o %t.dSYM
+RUN: llvm-dwarfdump %t.dSYM | FileCheck %s
+
+CHECK: DW_TAG_compile_unit
+
+CHECK:          DW_AT_name      ("Container_ivars")
+CHECK-NEXT:     DW_AT_declaration       (true)
+
+CHECK: DW_TAG_compile_unit
+
+CHECK:          DW_AT_name      ("Container_ivars")
+CHECK-NEXT:     DW_AT_byte_size (0x01)
+CHECK-NEXT:     DW_AT_decl_file ("/tmp/union/container.cpp")
+CHECK-NEXT:     DW_AT_decl_line (4)