From 66b37db64158e3ddedfe7598582f29798ee07d08 Mon Sep 17 00:00:00 2001
From: Eric Christopher <echristo@apple.com>
Date: Thu, 10 Nov 2011 21:47:55 +0000
Subject: [PATCH] Make types and namespaces take multiple DIEs for the
 accelerator tables as well.

llvm-svn: 144319
---
 .../lib/CodeGen/AsmPrinter/DwarfCompileUnit.h | 18 +++++++++++------
 llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp    | 20 +++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
index 453e89857920..07a772338ee9 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
@@ -64,8 +64,8 @@ class CompileUnit {
   ///
   StringMap<std::vector<DIE*> > AccelNames;
   StringMap<std::vector<DIE*> > AccelObjC;
-  StringMap<DIE*> AccelNamespace;
-  StringMap<DIE*> AccelTypes;
+  StringMap<std::vector<DIE*> > AccelNamespace;
+  StringMap<std::vector<DIE*> > AccelTypes;
 
   /// DIEBlocks - A list of all the DIEBlocks in use.
   std::vector<DIEBlock *> DIEBlocks;
@@ -90,8 +90,12 @@ public:
   const StringMap<std::vector<DIE*> > &getAccelObjC() const {
     return AccelObjC;
   }
-  const StringMap<DIE*> &getAccelNamespace() const { return AccelNamespace; }
-  const StringMap<DIE*> &getAccelTypes() const { return AccelTypes; }
+  const StringMap<std::vector<DIE*> > &getAccelNamespace() const {
+    return AccelNamespace;
+  }
+  const StringMap<std::vector<DIE*> > &getAccelTypes() const {
+    return AccelTypes;
+  }
   
   /// hasContent - Return true if this compile unit has something to write out.
   ///
@@ -112,10 +116,12 @@ public:
     DIEs.push_back(Die);
   }
   void addAccelNamespace(StringRef Name, DIE *Die) {
-    AccelNamespace[Name] = Die;
+    std::vector<DIE*> &DIEs = AccelNamespace[Name];
+    DIEs.push_back(Die);
   }
   void addAccelType(StringRef Name, DIE *Die) {
-    AccelTypes[Name] = Die;
+    std::vector<DIE*> &DIEs = AccelTypes[Name];
+    DIEs.push_back(Die);
   }
   
   /// getDIE - Returns the debug information entry map slot for the
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 3ca23183a296..5d05a3cc3aa1 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -1823,12 +1823,14 @@ void DwarfDebug::emitAccelNamespaces() {
   for (DenseMap<const MDNode *, CompileUnit *>::iterator I = CUMap.begin(),
          E = CUMap.end(); I != E; ++I) {
     CompileUnit *TheCU = I->second;
-    const StringMap<DIE*> &Names = TheCU->getAccelNamespace();
-    for (StringMap<DIE*>::const_iterator
+    const StringMap<std::vector<DIE*> > &Names = TheCU->getAccelNamespace();
+    for (StringMap<std::vector<DIE*> >::const_iterator
            GI = Names.begin(), GE = Names.end(); GI != GE; ++GI) {
       const char *Name = GI->getKeyData();
-      DIE *Entity = GI->second;
-      AT.AddName(Name, Entity);
+      std::vector<DIE *> Entities = GI->second;
+      for (std::vector<DIE *>::const_iterator DI = Entities.begin(),
+             DE = Entities.end(); DI != DE; ++DI)
+        AT.AddName(Name, (*DI));
     }
   }
 
@@ -1849,12 +1851,14 @@ void DwarfDebug::emitAccelTypes() {
   for (DenseMap<const MDNode *, CompileUnit *>::iterator I = CUMap.begin(),
          E = CUMap.end(); I != E; ++I) {
     CompileUnit *TheCU = I->second;
-    const StringMap<DIE*> &Names = TheCU->getAccelTypes();
-    for (StringMap<DIE*>::const_iterator
+    const StringMap<std::vector<DIE*> > &Names = TheCU->getAccelTypes();
+    for (StringMap<std::vector<DIE*> >::const_iterator
            GI = Names.begin(), GE = Names.end(); GI != GE; ++GI) {
       const char *Name = GI->getKeyData();
-      DIE *Entity = GI->second;
-      AT.AddName(Name, Entity);
+      std::vector<DIE *> Entities = GI->second;
+      for (std::vector<DIE *>::const_iterator DI = Entities.begin(),
+             DE= Entities.end(); DI !=DE; ++DI)
+        AT.AddName(Name, (*DI));
     }
   }