[llvm-commits] [llvm] r98364 - in /llvm/trunk: lib/Target/X86/AsmPrinter/X86MCInstLower.cpp test/CodeGen/X86/pic.ll

[Chris Lattner]

Author: lattner
Date: Fri Mar 12 12:47:50 2010
New Revision: 98364

URL: http://llvm.org/viewvc/llvm-project?rev=98364&view=rev
Log:
simplify code to use OutContext.GetOrCreateTemporarySymbol with
no arguments instead of having to come up with a unique name.
This also makes the code less fragile.

Modified:
    llvm/trunk/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
    llvm/trunk/test/CodeGen/X86/pic.ll

Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp?rev=98364&r1=98363&r2=98364&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp Fri Mar 12 12:47:50 2010
@@ -406,11 +406,8 @@
     // For this, we want to print something like:
     //   MYGLOBAL + (. - PICBASE)
     // However, we can't generate a ".", so just emit a new label here and refer
-    // to it.  We know that this operand flag occurs at most once per function.
-    const char *Prefix = MAI->getPrivateGlobalPrefix();
-    MCSymbol *DotSym = OutContext.GetOrCreateTemporarySymbol(Twine(Prefix)+
-                                                             "picbaseref" +
-                                                    Twine(getFunctionNumber()));
+    // to it.
+    MCSymbol *DotSym = OutContext.GetOrCreateTemporarySymbol();
     OutStreamer.EmitLabel(DotSym);
     
     // Now that we have emitted the label, lower the complex operand expression.

Modified: llvm/trunk/test/CodeGen/X86/pic.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pic.ll?rev=98364&r1=98363&r2=98364&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/pic.ll (original)
+++ llvm/trunk/test/CodeGen/X86/pic.ll Fri Mar 12 12:47:50 2010
@@ -15,7 +15,7 @@
 ; LINUX:	call	.L1$pb
 ; LINUX-NEXT: .L1$pb:
 ; LINUX-NEXT:	popl
-; LINUX:	addl	$_GLOBAL_OFFSET_TABLE_+(.Lpicbaseref1-.L1$pb),
+; LINUX:	addl	$_GLOBAL_OFFSET_TABLE_+(.L{{.*}}-.L1$pb),
 ; LINUX:	movl	dst at GOT(%eax),
 ; LINUX:	movl	ptr at GOT(%eax),
 ; LINUX:	movl	src at GOT(%eax),
@@ -37,7 +37,7 @@
 ; LINUX:	call	.L2$pb
 ; LINUX-NEXT: .L2$pb:
 ; LINUX-NEXT:	popl
-; LINUX:	addl	$_GLOBAL_OFFSET_TABLE_+(.Lpicbaseref2-.L2$pb), %eax
+; LINUX:	addl	$_GLOBAL_OFFSET_TABLE_+(.L{{.*}}-.L2$pb), %eax
 ; LINUX:	movl	dst2 at GOT(%eax),
 ; LINUX:	movl	ptr2 at GOT(%eax),
 ; LINUX:	movl	src2 at GOT(%eax),
@@ -57,7 +57,7 @@
 ; LINUX-NEXT: 	call	.L3$pb
 ; LINUX-NEXT: .L3$pb:
 ; LINUX-NEXT: 	popl	%ebx
-; LINUX: 	addl	$_GLOBAL_OFFSET_TABLE_+(.Lpicbaseref3-.L3$pb), %ebx
+; LINUX: 	addl	$_GLOBAL_OFFSET_TABLE_+(.L{{.*}}-.L3$pb), %ebx
 ; LINUX: 	movl	$40, (%esp)
 ; LINUX: 	call	malloc at PLT
 ; LINUX: 	addl	$8, %esp
@@ -78,7 +78,7 @@
 ; LINUX: 	call	.L4$pb
 ; LINUX-NEXT: .L4$pb:
 ; LINUX: 	popl
-; LINUX: 	addl	$_GLOBAL_OFFSET_TABLE_+(.Lpicbaseref4-.L4$pb),
+; LINUX: 	addl	$_GLOBAL_OFFSET_TABLE_+(.L{{.*}}-.L4$pb),
 ; LINUX: 	movl	pfoo at GOT(%esi),
 ; LINUX: 	call	afoo at PLT
 ; LINUX: 	call	*
@@ -93,7 +93,7 @@
 ; LINUX: test5:
 ; LINUX: call	.L5$pb
 ; LINUX: popl	%ebx
-; LINUX: addl	$_GLOBAL_OFFSET_TABLE_+(.Lpicbaseref5-.L5$pb), %ebx
+; LINUX: addl	$_GLOBAL_OFFSET_TABLE_+(.L{{.*}}-.L5$pb), %ebx
 ; LINUX: call	foo at PLT
 }
 
@@ -115,7 +115,7 @@
 ; LINUX: 	call	.L6$pb
 ; LINUX-NEXT: .L6$pb:
 ; LINUX-NEXT: 	popl	%eax
-; LINUX: 	addl	$_GLOBAL_OFFSET_TABLE_+(.Lpicbaseref6-.L6$pb), %eax
+; LINUX: 	addl	$_GLOBAL_OFFSET_TABLE_+(.L{{.*}}-.L6$pb), %eax
 ; LINUX: 	leal	dst6 at GOTOFF(%eax), %ecx
 ; LINUX: 	movl	%ecx, ptr6 at GOTOFF(%eax)
 ; LINUX: 	movl	src6 at GOTOFF(%eax), %ecx
@@ -136,7 +136,7 @@
 ; LINUX: test7:
 ; LINUX:    call .L7$pb
 ; LINUX: .L7$pb:
-; LINUX:    addl	$_GLOBAL_OFFSET_TABLE_+(.Lpicbaseref7-.L7$pb), 
+; LINUX:    addl	$_GLOBAL_OFFSET_TABLE_+(.L{{.*}}-.L7$pb), 
 ; LINUX:    fldl	.LCPI7_0 at GOTOFF(
 }
 
@@ -188,7 +188,7 @@
 ; LINUX: test8:
 ; LINUX:   call	.L8$pb
 ; LINUX: .L8$pb:
-; LINUX:   addl	$_GLOBAL_OFFSET_TABLE_+(.Lpicbaseref8-.L8$pb),
+; LINUX:   addl	$_GLOBAL_OFFSET_TABLE_+(.L{{.*}}-.L8$pb),
 ; LINUX:   addl	.LJTI8_0 at GOTOFF(
 ; LINUX:   jmpl	*