commit 8fed05ec1ba90c688d71323fe8a1c3070adf58cf
author David Blaikie <dblaikie@gmail.com> Mon Jul 01 23:55:52 2013 +0000
committer David Blaikie <dblaikie@gmail.com> Mon Jul 01 23:55:52 2013 +0000
tree 0cd4f32412ecce66ab5bf570d93dd8e9230762a0
parent b57770387ab262a0a23e77f094f599b6c955ba14

PR14728: DebugInfo: TLS variables with -gsplit-dwarf

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

lib/CodeGen/AsmPrinter/DwarfDebug.cpp

diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index ead90c0..0731b90 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -248,7 +248,11 @@
 }
 
 unsigned DwarfUnits::getAddrPoolIndex(const MCSymbol *Sym) {
-  std::pair<DenseMap<const MCSymbol *, unsigned>::iterator, bool> P =
+  return getAddrPoolIndex(MCSymbolRefExpr::Create(Sym, Asm->OutContext));
+}
+
+unsigned DwarfUnits::getAddrPoolIndex(const MCSymbolRefExpr *Sym) {
+  std::pair<DenseMap<const MCSymbolRefExpr *, unsigned>::iterator, bool> P =
       AddressPool.insert(std::make_pair(Sym, NextAddrPoolNumber));
   if (P.second)
     ++NextAddrPoolNumber;
@@ -2357,10 +2361,11 @@
 
   // Get all of the address pool entries and put them in an array by their ID so
   // we can sort them.
-  SmallVector<std::pair<unsigned, const MCSymbol *>, 64> Entries;
+  SmallVector<std::pair<unsigned, const MCSymbolRefExpr *>, 64> Entries;
 
-  for (DenseMap<const MCSymbol *, unsigned>::iterator I = AddressPool.begin(),
-                                                      E = AddressPool.end();
+  for (DenseMap<const MCSymbolRefExpr *, unsigned>::iterator
+           I = AddressPool.begin(),
+           E = AddressPool.end();
        I != E; ++I)
     Entries.push_back(std::make_pair(I->second, I->first));
 
@@ -2368,8 +2373,8 @@
 
   for (unsigned i = 0, e = Entries.size(); i != e; ++i) {
     // Emit a label for reference from debug information entries.
-    if (const MCSymbol *Sym = Entries[i].second)
-      Asm->EmitLabelReference(Sym, Asm->getDataLayout().getPointerSize());
+    if (const MCSymbolRefExpr *Sym = Entries[i].second)
+      Asm->OutStreamer.EmitValue(Sym, Asm->getDataLayout().getPointerSize());
     else
       Asm->OutStreamer.EmitIntValue(0, Asm->getDataLayout().getPointerSize());
   }