From 795e462cc4a94bd6cceefc441038027f4179841b Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Tue, 22 Apr 2014 17:21:40 +0000
Subject: [PATCH] Simplify address pool index assignment.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206905 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 4 +---
 lib/CodeGen/AsmPrinter/DwarfDebug.h   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 63f510db458..7f1bebaf124 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -257,9 +257,7 @@ unsigned DwarfFile::getStringPoolIndex(StringRef Str) {
 
 unsigned DwarfFile::getAddrPoolIndex(const MCSymbol *Sym, bool TLS) {
   std::pair<AddrPool::iterator, bool> P = AddressPool.insert(
-      std::make_pair(Sym, AddressPoolEntry(NextAddrPoolNumber, TLS)));
-  if (P.second)
-    ++NextAddrPoolNumber;
+      std::make_pair(Sym, AddressPoolEntry(AddressPool.size(), TLS)));
   return P.first->second.Number;
 }
 
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.h b/lib/CodeGen/AsmPrinter/DwarfDebug.h
index 8c4514e615e..363d7650e0b 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.h
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.h
@@ -166,12 +166,10 @@ class DwarfFile {
   // references.
   typedef DenseMap<const MCSymbol *, AddressPoolEntry> AddrPool;
   AddrPool AddressPool;
-  unsigned NextAddrPoolNumber;
 
 public:
   DwarfFile(AsmPrinter *AP, const char *Pref, BumpPtrAllocator &DA)
-      : Asm(AP), StringPool(DA), NextStringPoolNumber(0), StringPref(Pref),
-        AddressPool(), NextAddrPoolNumber(0) {}
+      : Asm(AP), StringPool(DA), NextStringPoolNumber(0), StringPref(Pref) {}
 
   ~DwarfFile();
 
-- 
2.34.1