[llvm] r249362 - dsymutil: Don't prune forward declarations inside of an imported TAG_module

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Mon Oct  5 18:11:20 2015
New Revision: 249362

URL: http://llvm.org/viewvc/llvm-project?rev=249362&view=rev
Log:
dsymutil: Don't prune forward declarations inside of an imported TAG_module
if there exists not definition for the type.
For this to work, we need to clone the imported modules before building
the decl context chains of the DIEs in the non-skeleton CUs.

Modified:
    llvm/trunk/test/tools/dsymutil/Inputs/submodules/1.o
    llvm/trunk/test/tools/dsymutil/Inputs/submodules/Parent.pcm
    llvm/trunk/test/tools/dsymutil/X86/submodules.m
    llvm/trunk/tools/dsymutil/DwarfLinker.cpp

Modified: llvm/trunk/test/tools/dsymutil/Inputs/submodules/1.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/Inputs/submodules/1.o?rev=249362&r1=249361&r2=249362&view=diff
==============================================================================
Binary files llvm/trunk/test/tools/dsymutil/Inputs/submodules/1.o (original) and llvm/trunk/test/tools/dsymutil/Inputs/submodules/1.o Mon Oct  5 18:11:20 2015 differ

Modified: llvm/trunk/test/tools/dsymutil/Inputs/submodules/Parent.pcm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/Inputs/submodules/Parent.pcm?rev=249362&r1=249361&r2=249362&view=diff
==============================================================================
Binary files llvm/trunk/test/tools/dsymutil/Inputs/submodules/Parent.pcm (original) and llvm/trunk/test/tools/dsymutil/Inputs/submodules/Parent.pcm Mon Oct  5 18:11:20 2015 differ

Modified: llvm/trunk/test/tools/dsymutil/X86/submodules.m
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/submodules.m?rev=249362&r1=249361&r2=249362&view=diff
==============================================================================
--- llvm/trunk/test/tools/dsymutil/X86/submodules.m (original)
+++ llvm/trunk/test/tools/dsymutil/X86/submodules.m Mon Oct  5 18:11:20 2015
@@ -4,9 +4,13 @@
      module Child {
        header "Child.h"
      }
+     module Empty {
+       header "Empty.h"
+     }
    }
 EOF
    clang -D CHILD_H -E -o Child.h submodules.m
+   touch empty.h
    clang -cc1 -emit-obj -fmodules -fmodule-map-file=modules.modulemap \
      -fmodule-format=obj -g -dwarf-ext-refs -fmodules-cache-path=. \
      -fdisable-module-hash submodules.m -o 1.o
@@ -19,6 +23,7 @@ EOF
 // ---------------------------------------------------------------------
 #ifdef CHILD_H
 // ---------------------------------------------------------------------
+
 // CHECK:            DW_TAG_compile_unit
 // CHECK-NOT:        DW_TAG
 // CHECK:              DW_TAG_module
@@ -28,13 +33,22 @@ EOF
 // CHECK:                  DW_TAG_structure_type
 // CHECK-NOT:                DW_TAG
 // CHECK:                    DW_AT_name {{.*}}"PruneMeNot"
-
 struct PruneMeNot;
 
 // ---------------------------------------------------------------------
 #else
 // ---------------------------------------------------------------------
 
+// CHECK:            DW_TAG_compile_unit
+// CHECK:              DW_TAG_module
+// CHECK-NEXT:           DW_AT_name{{.*}}"Parent"
+// CHECK:              DW_TAG_module
+// CHECK-NEXT:           DW_AT_name{{.*}}"Child"
+// CHECK: 0x0[[EMPTY:.*]]: DW_TAG_module
+// CHECK-NEXT:             DW_AT_name{{.*}}"Empty"
+
+// CHECK:     DW_AT_import  {{.*}}0x{{0*}}[[EMPTY]]
 @import Parent.Child;
+ at import Parent.Empty;
 int main(int argc, char **argv) { return 0; }
 #endif

Modified: llvm/trunk/tools/dsymutil/DwarfLinker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/DwarfLinker.cpp?rev=249362&r1=249361&r2=249362&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/DwarfLinker.cpp (original)
+++ llvm/trunk/tools/dsymutil/DwarfLinker.cpp Mon Oct  5 18:11:20 2015
@@ -1807,6 +1807,9 @@ static bool analyzeContextInfo(const DWA
                 DIE->getAttributeValueAsUnsignedConstant(
                     &CU.getOrigUnit(), dwarf::DW_AT_declaration, 0);
 
+  // Don't prune it if there is no definition for the DIE.
+  Info.Prune &= Info.Ctxt && Info.Ctxt->getCanonicalDIEOffset();
+
   return Info.Prune;
 }
 
@@ -3338,21 +3341,23 @@ bool DwarfLinker::link(const DebugMap &M
     DWARFContextInMemory DwarfContext(*ErrOrObj);
     startDebugObject(DwarfContext, *Obj);
 
-    // In a first phase, just read in the debug info and store the DIE
-    // parent links that we will use during the next phase.
+    // In a first phase, just read in the debug info and load all clang modules.
     for (const auto &CU : DwarfContext.compile_units()) {
       auto *CUDie = CU->getUnitDIE(false);
       if (Options.Verbose) {
         outs() << "Input compilation unit:";
         CUDie->dump(outs(), CU.get(), 0);
       }
-      if (!registerModuleReference(*CUDie, *CU, ModuleMap)) {
+
+      if (!registerModuleReference(*CUDie, *CU, ModuleMap))
         Units.emplace_back(*CU, UnitID++, !Options.NoODR, "");
-        analyzeContextInfo(CUDie, 0, Units.back(), &ODRContexts.getRoot(),
-                           StringPool, ODRContexts);
-      }
     }
 
+    // Now build the DIE parent links that we will use during the next phase.
+    for (auto &CurrentUnit : Units)
+      analyzeContextInfo(CurrentUnit.getOrigUnit().getUnitDIE(), 0, CurrentUnit,
+                         &ODRContexts.getRoot(), StringPool, ODRContexts);
+
     // Then mark all the DIEs that need to be present in the linked
     // output and collect some information about them. Note that this
     // loop can not be merged with the previous one becaue cross-cu