1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index b983cf2baf..73aa8d81ee 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -2746,7 +2746,6 @@ void DwarfDebug::endFunction(const MachineFunction *MF) {
     // Construct abstract scopes.
     for (SmallVector<DbgScope *, 4>::iterator AI = AbstractScopesList.begin(),
            AE = AbstractScopesList.end(); AI != AE; ++AI) {
-      constructScopeDIE(*AI);
       DISubprogram SP((*AI)->getScopeNode());
       if (SP.Verify()) {
         // Collect info for variables that were optimized out.
@@ -2761,12 +2760,13 @@ void DwarfDebug::endFunction(const MachineFunction *MF) {
           DIVariable DV(cast_or_null<MDNode>(NMD->getOperand(i)));
           if (!DV || !ProcessedVars.insert(DV))
             continue;
-          DbgScope *Scope = DbgScopeMap.lookup(DV.getContext());
+          DbgScope *Scope = AbstractScopes.lookup(DV.getContext());
           if (Scope)
             Scope->addVariable(new DbgVariable(DV));
           }
         }
       }
+      constructScopeDIE(*AI);
     }
     
     DIE *CurFnDIE = constructScopeDIE(CurrentFnDbgScope);