From 28127462389fde6b62ac5a03ec81b4139a7708f3 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Sun, 31 Aug 2014 05:46:17 +0000 Subject: [PATCH] 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. llvm-svn: 216840 --- llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 56ad9666e95b..cfffef7e747e 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -597,14 +597,14 @@ std::unique_ptr DwarfDebug::constructScopeDIE(DwarfCompileUnit &TheCU, ScopesWithImportedEntities.end(), std::pair(DS, nullptr), less_first()); - if (Children.empty() && Range.first == Range.second) + for (ImportedEntityMap::const_iterator i = Range.first; i != Range.second; + ++i) + 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."); - for (ImportedEntityMap::const_iterator i = Range.first; i != Range.second; - ++i) - ScopeDIE->addChild( - constructImportedEntityDIE(TheCU, DIImportedEntity(i->second))); } // Add children