commit 537b4a8159fc07709b9cb4b8c4e65c6deae358b3
author Duncan P. N. Exon Smith <dexonsmith@apple.com> Tue Apr 14 03:40:37 2015 +0000
committer Duncan P. N. Exon Smith <dexonsmith@apple.com> Tue Apr 14 03:40:37 2015 +0000
tree aabc381361f0e80b53ac261c8aaa936a7d0782e1
parent 68adb7da1abdca258ccfb87e929a42fd7e7af940

DebugInfo: Gut DISubprogram and DILexicalBlock*

Gut the `DIDescriptor` wrappers around `MDLocalScope` subclasses.  Note
that `DILexicalBlock` wraps `MDLexicalBlockBase`, not `MDLexicalBlock`.

llvm-svn: 234850

llvm/lib/Linker/LinkModules.cpp

diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp
index 75849db..03ab9fb 100644
--- a/llvm/lib/Linker/LinkModules.cpp
+++ b/llvm/lib/Linker/LinkModules.cpp
@@ -1272,12 +1272,8 @@
     DICompileUnit CU = cast<MDCompileUnit>(CompileUnits->getOperand(I));
     assert(CU && "Expected valid compile unit");
 
-    MDSubprogramArray SPs(CU.getSubprograms());
-    assert(SPs && "Expected valid subprogram array");
-
-    for (unsigned S = 0, SE = SPs.size(); S != SE; ++S) {
-      DISubprogram SP = SPs[S];
-      if (!SP || !SP.getFunction() || !Functions.count(SP.getFunction()))
+    for (MDSubprogram *SP : CU->getSubprograms()) {
+      if (!SP || !SP->getFunction() || !Functions.count(SP->getFunction()))
         continue;
 
       // Prevent DebugInfoFinder from tagging this as the canonical subprogram,