From 779e051357d214f049176d38751e8a20883cb4a8 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Sun, 4 Apr 2010 19:28:59 +0000
Subject: [PATCH] resolve a fixme.

llvm-svn: 100346
---
 lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 7 +------
 test/CodeGen/X86/personality.ll       | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 5c63cf28821..26277652f14 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -1350,12 +1350,7 @@ void AsmPrinter::printOffset(int64_t Offset, raw_ostream &OS) const {
 /// GetTempSymbol - Return the MCSymbol corresponding to the assembler
 /// temporary label with the specified stem and unique ID.
 MCSymbol *AsmPrinter::GetTempSymbol(StringRef Name, unsigned ID) const {
-  // FIXME: REMOVE this.  However, there is stuff in EH that passes counters in
-  // here that can be zero.
-  
-  //assert(ID && "Should use GetTempSymbol if no ID");
-  if (ID == 0) return GetTempSymbol(Name);
-  return OutContext.GetOrCreateSymbol(Twine(MAI->getPrivateGlobalPrefix())+
+  return OutContext.GetOrCreateSymbol(Twine(MAI->getPrivateGlobalPrefix()) +
                                       Name + Twine(ID));
 }
 
diff --git a/test/CodeGen/X86/personality.ll b/test/CodeGen/X86/personality.ll
index 5acf04cc06c..6789bb0c0fb 100644
--- a/test/CodeGen/X86/personality.ll
+++ b/test/CodeGen/X86/personality.ll
@@ -38,10 +38,10 @@ declare void @__gxx_personality_v0()
 
 declare void @__cxa_end_catch()
 
-; X64: Leh_frame_common_begin:
+; X64: Leh_frame_common_begin0:
 ; X64: .long	___gxx_personality_v0@GOTPCREL+4
 
-; X32: Leh_frame_common_begin:
+; X32: Leh_frame_common_begin0:
 ; X32: .long	L___gxx_personality_v0$non_lazy_ptr-
 ; ....