Linker: Split mapUnneededSubprograms into two; almost NFC

Split the loop through compile units in mapUnneededSubprograms in two.
First, visit imported entities to ensure that we've visited all need
subprograms.  Second, visit subprograms, and drop the ones we don't
need.

Hypothetically this protects against a subprogram from one compile unit
being referenced from an imported entity in a different compile unit.  I
don't think that's valid IR (a debug info expert could confirm), but I
think the refactor makes the code more clear.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@265233 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Linker/IRMover.cpp b/lib/Linker/IRMover.cpp
index b7058f4..57a5401 100644 (file)
--- a/lib/Linker/IRMover.cpp
+++ b/lib/Linker/IRMover.cpp
@@ -1040,22 +1040,26 @@ void IRLinker::mapUnneededSubprograms() {
   NamedMDNode *CompileUnits = SrcM->getNamedMetadata("llvm.dbg.cu");
   if (!CompileUnits)
     return;
+
+  // Seed the ValueMap with the imported entities, in case they reference new
+  // subprograms.
+  // FIXME: The DISubprogram for functions not linked in but kept due to
+  // being referenced by a DIImportedEntity should also get their
+  // IsDefinition flag is unset.
   for (unsigned I = 0, E = CompileUnits->getNumOperands(); I != E; ++I) {
-    auto *CU = cast<DICompileUnit>(CompileUnits->getOperand(I));
-
-    // Seed the ValueMap with the imported entities, in case they reference new
-    // subprograms.
-    // FIXME: The DISubprogram for functions not linked in but kept due to
-    // being referenced by a DIImportedEntity should also get their
-    // IsDefinition flag is unset.
-    if (MDTuple *IEs = CU->getImportedEntities().get())
+    if (MDTuple *IEs = cast<DICompileUnit>(CompileUnits->getOperand(I))
+                           ->getImportedEntities()
+                           .get())
       (void)MapMetadata(IEs, ValueMap,
                         ValueMapperFlags | RF_NullMapMissingGlobalValues,
                         &TypeMap, &GValMaterializer);
+  }
 
-    // Try to insert nullptr into the map for any SP not already mapped.  If
-    // the insertion succeeds, we don't need this subprogram.
-    for (auto *Op : CU->getSubprograms())
+  // Try to insert nullptr into the map for any SP not already mapped.  If
+  // the insertion succeeds, we don't need this subprogram.
+  for (unsigned I = 0, E = CompileUnits->getNumOperands(); I != E; ++I) {
+    for (auto *Op :
+         cast<DICompileUnit>(CompileUnits->getOperand(I))->getSubprograms())
       if (ValueMap.MD().insert(std::make_pair(Op, TrackingMDRef())).second)
         HasUnneededSPs = true;
   }