Debug info: Remove OdrMemberMap from DwarfDebug, it's not necessary.
Follow-up to r203982.

llvm-svn: 204162
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 87f1878..5fb603c 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -369,7 +369,6 @@
 // scope then create and insert DIEs for these variables.
 DIE *DwarfDebug::updateSubprogramScopeDIE(DwarfCompileUnit *SPCU,
                                           DISubprogram SP) {
-  SP = SPCU->getOdrUniqueSubprogram(resolve(SP.getContext()), SP);
   DIE *SPDie = SPCU->getDIE(SP);
 
   assert(SPDie && "Unable to find subprogram DIE!");
@@ -604,7 +603,8 @@
   if (!Scope || !Scope->getScopeNode())
     return NULL;
 
-  DIScope DS(Scope->getScopeNode());
+  // Unique scope where applicable.
+  DIScope DS(resolve(DIScope(Scope->getScopeNode()).getRef()));
 
   SmallVector<DIE *, 8> Children;
   DIE *ObjectPointer = NULL;