[dsymutil] Track incompleteness across unions

[JDevlieghere]

Summary

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.

[friss]

LGTM

[thakis]

Looks like this breaks tests on windows: http://45.33.8.238/win/45862/step_11.txt

Please take a look!

[JDevlieghere]

In D110443#3021836, @thakis wrote:

Looks like this breaks tests on windows: http://45.33.8.238/win/45862/step_11.txt

Please take a look!

Should be fixed by d0649320bf39efddf10a430c1821911060d684b2

llvm/lib/DWARFLinker/DWARFLinker.cpp

 /// Helper that updates the completeness of the current DIE based on the
 /// completeness of one of its children. It depends on the incompleteness of
 /// the children already being computed.
 static void updateChildIncompleteness(const DWARFDie &Die, CompileUnit &CU,
                                       CompileUnit::DIEInfo &ChildInfo) {
   switch (Die.getTag()) {
   case dwarf::DW_TAG_structure_type:
   case dwarf::DW_TAG_class_type:
+  case dwarf::DW_TAG_union_type:
     break;
   default:
     return;
   }
 
   CompileUnit::DIEInfo &MyInfo = CU.getInfo(Die);
 
   if (ChildInfo.Incomplete || ChildInfo.Prune)

llvm/test/tools/dsymutil/X86/union-fwd-decl.test

+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)