[llvm-commits] CVS: llvm/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll 2002-08-19-ResolveGlobalVarsEasier.ll 2003-10-21-GlobalResolveHack.ll

[Reid Spencer]

Changes in directory llvm/test/Transforms/FunctionResolve:

2002-08-19-ResolveGlobalVars.ll updated: 1.7 -> 1.8
2002-08-19-ResolveGlobalVarsEasier.ll updated: 1.5 -> 1.6
2003-10-21-GlobalResolveHack.ll updated: 1.3 -> 1.4
---
Log message:

For PR761: http://llvm.org/PR761 :
Remove "target endian/pointersize" or add "target datalayout" to make
the test parse properly or set the datalayout because defaults changes.

For PR645: http://llvm.org/PR645 :
Make global names use the @ prefix.

For llvm-upgrade changes:
Fix test cases or completely remove use of llvm-upgrade for test cases 
that cannot survive the new renaming or upgrade capabilities. 



---
Diffs of the changes:  (+18 -20)

 2002-08-19-ResolveGlobalVars.ll       |   12 ++++++------
 2002-08-19-ResolveGlobalVarsEasier.ll |   10 +++++-----
 2003-10-21-GlobalResolveHack.ll       |   16 +++++++---------
 3 files changed, 18 insertions(+), 20 deletions(-)


Index: llvm/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll
diff -u llvm/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll:1.7 llvm/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll:1.8
--- llvm/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll:1.7	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVars.ll	Fri Jan 26 02:25:06 2007
@@ -1,17 +1,17 @@
 ; Test that: extern int X[]  and int X[] = { 1, 2, 3, 4 } are resolved 
 ; correctly.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | not grep external
+; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep external
 
-%X = external global [0 x int]
-%X = global [4 x int] [ int 1, int 2, int 3, int 4 ]
+ at X = external global [0 x int]
+ at X = global [4 x int] [ int 1, int 2, int 3, int 4 ]
 
 implementation   ; Functions:
 
-int %foo(int %x) {
+int @foo(int %x) {
 bb1:                                    ;[#uses=0]
-	store int 5, int* getelementptr ([0 x int]* %X, long 0, long 2)
-	%F = getelementptr [0 x int]* %X, long 0, long 2
+	store int 5, int* getelementptr ([0 x int]* @X, long 0, long 2)
+	%F = getelementptr [0 x int]* @X, long 0, long 2
 	%val = load int* %F
         ret int %val
 }


Index: llvm/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll
diff -u llvm/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll:1.5 llvm/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll:1.6
--- llvm/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll:1.5	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/FunctionResolve/2002-08-19-ResolveGlobalVarsEasier.ll	Fri Jan 26 02:25:06 2007
@@ -1,19 +1,19 @@
 ; Test that: extern int X[]  and int X[] = { 1, 2, 3, 4 } are resolved 
 ; correctly.  This doesn't have constantexprs
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | not grep external
+; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | not grep external
 ;
 
-%X = external global [0 x int]
-%X = global [4 x int] [ int 1, int 2, int 3, int 4 ]
+ at X = external global [0 x int]
+ at X = global [4 x int] [ int 1, int 2, int 3, int 4 ]
 
 implementation   ; Functions:
 
 int %foo(int %x) {
 bb1:                                    ;[#uses=0]
-	%G = getelementptr [0 x int]* %X, long 0, long 1
+	%G = getelementptr [0 x int]* @X, long 0, long 1
 	store int 5, int* %G
-	%F = getelementptr [0 x int]* %X, long 0, long 2
+	%F = getelementptr [0 x int]* @X, long 0, long 2
 	%val = load int* %F
         ret int %val
 }


Index: llvm/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll
diff -u llvm/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll:1.3 llvm/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll:1.4
--- llvm/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll:1.3	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/FunctionResolve/2003-10-21-GlobalResolveHack.ll	Fri Jan 26 02:25:06 2007
@@ -1,14 +1,12 @@
 ; This tests a hack put into place specifically for the C++ libstdc++ library.
 ; It uses an ugly hack which is cleaned up by the funcresolve pass.
+;
+; RUN: llvm-as < %s | opt -funcresolve | llvm-dis | grep @X | grep '{'
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -funcresolve | llvm-dis | grep %X | grep '{'
+ at X = external global { i32 }
+ at X = global [ 4 x i8 ] zeroinitializer
 
-%X = external global { int }
-%X = global [ 4 x sbyte ] zeroinitializer
-
-implementation
-
-int* %test() {
-  %P = getelementptr {int}* %X, long 0, uint 0
-  ret int* %P
+define i32* @test() {
+  %P = getelementptr {i32}* @X, i64 0, i32 0
+  ret i32* %P
 }