From: David Blaikie <dblaikie@gmail.com>
Date: Sun, 31 Aug 2014 05:46:17 +0000 (+0000)
Subject: Delay adding imported entity DIEs to the lexical scope, streamlining the check for... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4b538d396ffe7798352b54677479c0f7739e8681;p=oota-llvm.git

Delay adding imported entity DIEs to the lexical scope, streamlining the check for "this scope has nothing in it"

This makes the emptiness of the scope with regards to variables and
nested scopes is the same as with regards to imported entities. Just
check if we had nothing at all before we build the node.

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

diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 56ad9666e95..cfffef7e747 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -597,14 +597,14 @@ std::unique_ptr<DIE> DwarfDebug::constructScopeDIE(DwarfCompileUnit &TheCU,
                          ScopesWithImportedEntities.end(),
                          std::pair<const MDNode *, const MDNode *>(DS, nullptr),
                          less_first());
-    if (Children.empty() && Range.first == Range.second)
-      return nullptr;
-    ScopeDIE = constructLexicalScopeDIE(TheCU, Scope);
-    assert(ScopeDIE && "Scope DIE should not be null.");
     for (ImportedEntityMap::const_iterator i = Range.first; i != Range.second;
          ++i)
-      ScopeDIE->addChild(
+      Children.push_back(
           constructImportedEntityDIE(TheCU, DIImportedEntity(i->second)));
+    if (Children.empty())
+      return nullptr;
+    ScopeDIE = constructLexicalScopeDIE(TheCU, Scope);
+    assert(ScopeDIE && "Scope DIE should not be null.");
   }
 
   // Add children