Fri Jan 26 00:26:15 PST 2007

Changes in directory llvm/test/Assembler:

2007-01-21-UpgradeNoArgs.ll added (r1.1)
2007-01-22-UpgradeMalformedShift.ll added (r1.1)
2007-01-22-UpgradeMalformedStruct.ll added (r1.1)
2007-01-22-UpgradeTypeMapInvalidMemory.ll added (r1.1)
2002-05-02-ParseError.ll updated: 1.8 -> 1.9
2002-07-25-ParserAssertionFailure.llx updated: 1.3 -> 1.4
2002-12-15-GlobalResolve.ll updated: 1.4 -> 1.5
2003-04-15-ConstantInitAssertion.llx updated: 1.3 -> 1.4
2003-05-21-MalformedShiftCrash.llx updated: 1.4 -> 1.5
2003-05-21-MalformedStructCrash.llx updated: 1.4 -> 1.5
2003-12-30-TypeMapInvalidMemory.llx updated: 1.4 -> 1.5
2004-11-28-InvalidTypeCrash.ll updated: 1.4 -> 1.5
2005-01-31-CallingAggregateFunction.ll updated: 1.2 -> 1.3
2006-09-28-CrashOnInvalid.ll updated: 1.2 -> 1.3
2006-12-09-Cast-To-Bool.ll updated: 1.4 -> 1.5
2007-01-02-Undefined-Arg-Type.ll updated: 1.2 -> 1.3
2007-01-05-Local-Name-Conflict.ll updated: 1.2 -> 1.3
2007-01-12-Varargs-Upgrade.ll updated: 1.1 -> 1.2
2007-01-16-CrashOnBadCast.ll updated: 1.1 -> 1.2
2007-01-16-CrashOnBadCast2.ll updated: 1.1 -> 1.2
---
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:  (+60 -61)

 2002-05-02-ParseError.ll                  |    2 -
 2002-07-25-ParserAssertionFailure.llx     |   10 ++++-----
 2002-12-15-GlobalResolve.ll               |    3 --
 2003-04-15-ConstantInitAssertion.llx      |    4 +--
 2003-05-21-MalformedShiftCrash.llx        |    4 +--
 2003-05-21-MalformedStructCrash.llx       |    4 +--
 2003-12-30-TypeMapInvalidMemory.llx       |    5 +---
 2004-11-28-InvalidTypeCrash.ll            |    4 +--
 2005-01-31-CallingAggregateFunction.ll    |    9 ++++----
 2006-09-28-CrashOnInvalid.ll              |    7 +++---
 2006-12-09-Cast-To-Bool.ll                |    3 +-
 2007-01-02-Undefined-Arg-Type.ll          |    2 -
 2007-01-05-Local-Name-Conflict.ll         |    1 
 2007-01-12-Varargs-Upgrade.ll             |   33 ++----------------------------
 2007-01-16-CrashOnBadCast.ll              |    2 -
 2007-01-16-CrashOnBadCast2.ll             |    2 -
 2007-01-21-UpgradeNoArgs.ll               |   13 +++++++++++
 2007-01-22-UpgradeMalformedShift.ll       |    4 +++
 2007-01-22-UpgradeMalformedStruct.ll      |    4 +++
 2007-01-22-UpgradeTypeMapInvalidMemory.ll |    5 ++++
 20 files changed, 60 insertions(+), 61 deletions(-)


Index: llvm/test/Assembler/2007-01-21-UpgradeNoArgs.ll
diff -c /dev/null llvm/test/Assembler/2007-01-21-UpgradeNoArgs.ll:1.1
*** /dev/null	Fri Jan 26 02:25:16 2007

--- llvm/test/Assembler/2007-01-21-UpgradeNoArgs.ll	Fri Jan 26 02:25:05 2007
***************
*** 0 ****
--- 1,13 ----
+ ; Make sure we don't get an assertion failure, even though this is a parse 
+ ; error
+ ; RUN: llvm-upgrade 2>&1 < %s > /dev/null | grep 'No arguments passed to a '
+ 
+ %ty = type void (int)
+ 
+ declare %ty* %foo()
+ 
+ void %test() {
+         call %ty* %foo( )               ; <%ty*>:0 [#uses=0]
+         ret void
+ }
+ 


Index: llvm/test/Assembler/2007-01-22-UpgradeMalformedShift.ll
diff -c /dev/null llvm/test/Assembler/2007-01-22-UpgradeMalformedShift.ll:1.1
*** /dev/null	Fri Jan 26 02:26:15 2007
--- llvm/test/Assembler/2007-01-22-UpgradeMalformedShift.ll	Fri Jan 26 02:25:05 2007
***************
*** 0 ****
--- 1,4 ----
+ ; Found by inspection of the code
+ ; RUN: llvm-upgrade 2>&1 < %s > /dev/null | grep "Shift constant expression"
+ 
+ global int shr (float 1.0, ubyte 2)


Index: llvm/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll
diff -c /dev/null llvm/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll:1.1
*** /dev/null	Fri Jan 26 02:26:15 2007
--- llvm/test/Assembler/2007-01-22-UpgradeMalformedStruct.ll	Fri Jan 26 02:25:05 2007
***************
*** 0 ****
--- 1,4 ----
+ ; Found by inspection of the code
+ ; RUN: llvm-upgrade 2>&1 < %s  > /dev/null | grep "Illegal number of init"
+ 
+ global {} { int 7, float 1.0, int 7, int 8 }


Index: llvm/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll
diff -c /dev/null llvm/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll:1.1
*** /dev/null	Fri Jan 26 02:26:15 2007
--- llvm/test/Assembler/2007-01-22-UpgradeTypeMapInvalidMemory.ll	Fri Jan 26 02:25:05 2007
***************
*** 0 ****
--- 1,5 ----
+ ; RUN: llvm-upgrade 2>&1 < %s -o /dev/null -f | grep 'Reference to an undef'
+ 
+ %d_reduction_0_dparser_gram = global { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)*, int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sby!
 te*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** } { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, !
 int, int }*)* null, int (sbyte*, sbyte**, int, int, { %struct.!
 Grammar*
, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** null }
+ 
+ implementation


Index: llvm/test/Assembler/2002-05-02-ParseError.ll
diff -u llvm/test/Assembler/2002-05-02-ParseError.ll:1.8 llvm/test/Assembler/2002-05-02-ParseError.ll:1.9
--- llvm/test/Assembler/2002-05-02-ParseError.ll:1.8	Fri Jan  5 11:29:41 2007
+++ llvm/test/Assembler/2002-05-02-ParseError.ll	Fri Jan 26 02:25:05 2007
@@ -5,6 +5,6 @@
 
 %T = type i32 *
 
-define %T %test() {
+define %T @test() {
 	ret %T null
 }


Index: llvm/test/Assembler/2002-07-25-ParserAssertionFailure.llx
diff -u llvm/test/Assembler/2002-07-25-ParserAssertionFailure.llx:1.3 llvm/test/Assembler/2002-07-25-ParserAssertionFailure.llx:1.4
--- llvm/test/Assembler/2002-07-25-ParserAssertionFailure.llx:1.3	Fri Dec 29 14:01:32 2006
+++ llvm/test/Assembler/2002-07-25-ParserAssertionFailure.llx	Fri Jan 26 02:25:05 2007
@@ -1,13 +1,13 @@
 ; Make sure we don't get an assertion failure, even though this is a parse 
 ; error
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f 2>&1 | grep 'No arguments'
+; RUN: llvm-as 2>&1 < %s -o /dev/null -f | grep 'No arguments'
 
-%ty = type void (int)
+%ty = type void (i32)
 
-declare %ty* %foo()
+declare %ty* @foo()
 
-void %test() {
-        call %ty* %foo( )               ; <%ty*>:0 [#uses=0]
+define void @test() {
+        call %ty* @foo( )               ; <%ty*>:0 [#uses=0]
         ret void
 }
 


Index: llvm/test/Assembler/2002-12-15-GlobalResolve.ll
diff -u llvm/test/Assembler/2002-12-15-GlobalResolve.ll:1.4 llvm/test/Assembler/2002-12-15-GlobalResolve.ll:1.5
--- llvm/test/Assembler/2002-12-15-GlobalResolve.ll:1.4	Fri Jan  5 11:35:05 2007
+++ llvm/test/Assembler/2002-12-15-GlobalResolve.ll	Fri Jan 26 02:25:05 2007
@@ -1,6 +1,5 @@
 ; RUN: llvm-upgrade < %s 2>/dev/null | llvm-as -o /dev/null -f &&
-; RUN: llvm-upgrade < %s 2>&1 | grep "Cannot disambiguate global value '%X'" &&
-; RUN: llvm-upgrade < %s 2>&1 | grep "Renaming global value '%X' to '%X.un"
+; RUN: llvm-upgrade < %s 2>&1 | grep "Renaming global variable 'X' to"
 
 %X = external global uint *
 %X = external global %T* 


Index: llvm/test/Assembler/2003-04-15-ConstantInitAssertion.llx
diff -u llvm/test/Assembler/2003-04-15-ConstantInitAssertion.llx:1.3 llvm/test/Assembler/2003-04-15-ConstantInitAssertion.llx:1.4
--- llvm/test/Assembler/2003-04-15-ConstantInitAssertion.llx:1.3	Sun Dec 31 00:01:59 2006
+++ llvm/test/Assembler/2003-04-15-ConstantInitAssertion.llx	Fri Jan 26 02:25:05 2007
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as 2>&1 >/dev/null | grep Expected
+; RUN: llvm-as 2>&1 < %s >/dev/null | grep "Expected type 'i32' for element #0"
 ; Test the case of a misformed constant initializer
 ; This should cause an assembler error, not an assertion failure!
-%X = constant {int} { float 1.0 }
+constant { i32 } { float 1.0 }


Index: llvm/test/Assembler/2003-05-21-MalformedShiftCrash.llx
diff -u llvm/test/Assembler/2003-05-21-MalformedShiftCrash.llx:1.4 llvm/test/Assembler/2003-05-21-MalformedShiftCrash.llx:1.5
--- llvm/test/Assembler/2003-05-21-MalformedShiftCrash.llx:1.4	Sun Dec 31 00:01:59 2006
+++ llvm/test/Assembler/2003-05-21-MalformedShiftCrash.llx	Fri Jan 26 02:25:05 2007
@@ -1,4 +1,4 @@
 ; Found by inspection of the code
-; RUN: llvm-upgrade < %s | llvm-as 2>&1 > /dev/null | grep "Shift constant expression"
+; RUN: llvm-as 2>&1 < %s > /dev/null | grep "Shift constant expression"
 
-global int shr (float 1.0, ubyte 2)
+global i32 ashr (float 1.0, i8 2)


Index: llvm/test/Assembler/2003-05-21-MalformedStructCrash.llx
diff -u llvm/test/Assembler/2003-05-21-MalformedStructCrash.llx:1.4 llvm/test/Assembler/2003-05-21-MalformedStructCrash.llx:1.5
--- llvm/test/Assembler/2003-05-21-MalformedStructCrash.llx:1.4	Sun Dec 31 00:01:59 2006
+++ llvm/test/Assembler/2003-05-21-MalformedStructCrash.llx	Fri Jan 26 02:25:05 2007
@@ -1,4 +1,4 @@
 ; Found by inspection of the code
-; RUN: llvm-upgrade < %s | llvm-as 2>&1 > /dev/null | grep "Illegal"
+; RUN: llvm-as 2>&1 < %s  > /dev/null | grep "Illegal number of init"
 
-global {} { int 7, float 1.0, int 7, int 8 }
+global {} { i32 7, float 1.0, i32 7, i32 8 }


Index: llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
diff -u llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx:1.4 llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx:1.5
--- llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx:1.4	Sun Dec 31 00:01:59 2006
+++ llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx	Fri Jan 26 02:25:05 2007
@@ -1,7 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f 2>&1 | \
-; RUN:   grep 'Reference to an undefined type'
+; RUN: llvm-as      2>&1 < %s -o /dev/null -f | grep 'Reference to an undef'
 
 
-%d_reduction_0_dparser_gram = global { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)*, int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyt!
 e*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** } { int (sbyte*, sbyte**, int, int, { %struct.Grammar*, void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, i!
 nt, int }*)* null, int (sbyte*, sbyte**, int, int, { %struct.G!
 rammar*,
 void (\4, %struct.d_loc_t*, sbyte**)*, %struct.D_Scope*, void (\4)*, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, int, { int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ int, %struct.d_loc_t, sbyte*, sbyte*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, sbyte**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, int, int, int, int, int, int, int, int, int, int, int, int }*)** null }
+ at d_reduction_0_dparser_gram = global { i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)*, i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8!
 **)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)** } { i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)* null, i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct!
 .D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %stru!
 ct.D_Sco
pe*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)** null }
 
 implementation


Index: llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll
diff -u llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll:1.4 llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll:1.5
--- llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll:1.4	Fri Jan  5 11:37:59 2007
+++ llvm/test/Assembler/2004-11-28-InvalidTypeCrash.ll	Fri Jan 26 02:25:05 2007
@@ -1,4 +1,4 @@
-; RUN: (llvm-upgrade < %s | llvm-as -o /dev/null -f) 2>&1 | \
+; RUN: llvm-as 2>&1 < %s -o /dev/null -f | \
 ; RUN:   grep 'Cannot create a null initialized value of this type!'
 ; Test for PR463.  This program is erroneous, but should not crash llvm-as.
-%.FOO  = internal global %struct.none zeroinitializer
+ at .FOO  = internal global %struct.none zeroinitializer


Index: llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll
diff -u llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll:1.2 llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll:1.3
--- llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll:1.2	Sat Dec  2 14:34:08 2006
+++ llvm/test/Assembler/2005-01-31-CallingAggregateFunction.ll	Fri Jan 26 02:25:05 2007
@@ -1,8 +1,9 @@
-; RUN: llvm-upgrade %s | llvm-as -o /dev/null -f 2>&1 | grep "LLVM functions cannot return aggregate types"
+; RUN: llvm-as 2>&1 < %s -o /dev/null -f | \
+; RUN:    grep "LLVM functions cannot return aggregate types"
 
-void %test() {
-	call {} %foo()
+define void @test() {
+	call {} @foo()
 	ret void
 }
 
-declare {} %foo()
+declare {} @foo()


Index: llvm/test/Assembler/2006-09-28-CrashOnInvalid.ll
diff -u llvm/test/Assembler/2006-09-28-CrashOnInvalid.ll:1.2 llvm/test/Assembler/2006-09-28-CrashOnInvalid.ll:1.3
--- llvm/test/Assembler/2006-09-28-CrashOnInvalid.ll:1.2	Sat Dec  2 14:34:08 2006
+++ llvm/test/Assembler/2006-09-28-CrashOnInvalid.ll	Fri Jan 26 02:25:05 2007
@@ -1,7 +1,8 @@
 ; Test for PR902.  This program is erroneous, but should not crash llvm-as.
 ; This tests that a simple error is caught and processed correctly.
-; RUN: llvm-upgrade < %s | llvm-as 2>&1 | grep 'FP constant invalid for type'
-void %test() {
-  add int 1, 2.0
+; RUN: llvm-as < %s 2>&1 >/dev/null | grep 'FP constant invalid for type'
+
+define void @test() {
+  add i32 1, 2.0
   ret void
 }


Index: llvm/test/Assembler/2006-12-09-Cast-To-Bool.ll
diff -u llvm/test/Assembler/2006-12-09-Cast-To-Bool.ll:1.4 llvm/test/Assembler/2006-12-09-Cast-To-Bool.ll:1.5
--- llvm/test/Assembler/2006-12-09-Cast-To-Bool.ll:1.4	Fri Jan 12 23:06:52 2007
+++ llvm/test/Assembler/2006-12-09-Cast-To-Bool.ll	Fri Jan 26 02:25:05 2007
@@ -1,5 +1,6 @@
 ; RUN: llvm-as < %s | llvm-dis | grep bitcast
-define i1 %main(i32 %X) {
+
+define i1 @main(i32 %X) {
   %res = bitcast i1 true to i1
   ret i1 %res
 }


Index: llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
diff -u llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll:1.2 llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll:1.3
--- llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll:1.2	Fri Jan 12 23:06:52 2007
+++ llvm/test/Assembler/2007-01-02-Undefined-Arg-Type.ll	Fri Jan 26 02:25:05 2007
@@ -5,6 +5,6 @@
 
 implementation   ; Functions:
 
-define i1 %someFunc(i32* %tmp.71.reload, %typedef.bc_struct* %n1) {
+define i1 @someFunc(i32* %tmp.71.reload, %typedef.bc_struct* %n1) {
 	ret i1 true
 }


Index: llvm/test/Assembler/2007-01-05-Local-Name-Conflict.ll
diff -u llvm/test/Assembler/2007-01-05-Local-Name-Conflict.ll:1.2 llvm/test/Assembler/2007-01-05-Local-Name-Conflict.ll:1.3
--- llvm/test/Assembler/2007-01-05-Local-Name-Conflict.ll:1.2	Fri Jan  5 23:16:27 2007
+++ llvm/test/Assembler/2007-01-05-Local-Name-Conflict.ll	Fri Jan 26 02:25:05 2007
@@ -1,5 +1,4 @@
 ; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
-; XFAIL: *
 
 implementation   ; Functions:
 


Index: llvm/test/Assembler/2007-01-12-Varargs-Upgrade.ll
diff -u llvm/test/Assembler/2007-01-12-Varargs-Upgrade.ll:1.1 llvm/test/Assembler/2007-01-12-Varargs-Upgrade.ll:1.2
--- llvm/test/Assembler/2007-01-12-Varargs-Upgrade.ll:1.1	Fri Jan 12 18:00:43 2007
+++ llvm/test/Assembler/2007-01-12-Varargs-Upgrade.ll	Fri Jan 26 02:25:05 2007
@@ -1,45 +1,18 @@
 ; For PR1093: This test checks that llvm-upgrade correctly translates
 ; the llvm.va_* intrinsics to their cannonical argument form (i8*).
 ; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \
-; RUN:   grep 'va_upgrade[0-9] = bitcast' | wc -l | grep 5
+; RUN:   grep ' bitcast' | wc -l | grep 5
 %str = internal constant [7 x ubyte] c"%d %d\0A\00"		; <[7 x ubyte]*> [#uses=1]
 
 implementation   ; Functions:
 
 void %f(int %a_arg, ...) {
 entry:
-	%a = cast int %a_arg to uint		; <uint> [#uses=1]
 	%l1 = alloca sbyte*, align 4		; <sbyte**> [#uses=5]
 	%l2 = alloca sbyte*, align 4		; <sbyte**> [#uses=4]
-	%memtmp = alloca sbyte*		; <sbyte**> [#uses=2]
+	%l3 = alloca sbyte*		; <sbyte**> [#uses=2]
 	call void %llvm.va_start( sbyte** %l1 )
-	%tmp22 = seteq int %a_arg, 0		; <bool> [#uses=1]
-	%tmp23 = volatile load sbyte** %l1		; <sbyte*> [#uses=2]
-	br bool %tmp22, label %bb8, label %bb
-
-bb:		; preds = %bb, %entry
-	%indvar = phi uint [ 0, %entry ], [ %indvar.next, %bb ]		; <uint> [#uses=1]
-	%tmp.0 = phi sbyte* [ %tmp23, %entry ], [ %tmp, %bb ]		; <sbyte*> [#uses=2]
-	%tmp2 = getelementptr sbyte* %tmp.0, int 4		; <sbyte*> [#uses=1]
-	volatile store sbyte* %tmp2, sbyte** %l1
-	%tmp3 = cast sbyte* %tmp.0 to int*		; <int*> [#uses=1]
-	%tmp = load int* %tmp3		; <int> [#uses=1]
-	%tmp = volatile load sbyte** %l1		; <sbyte*> [#uses=2]
-	%indvar.next = add uint %indvar, 1		; <uint> [#uses=2]
-	%exitcond = seteq uint %indvar.next, %a		; <bool> [#uses=1]
-	br bool %exitcond, label %bb8, label %bb
-
-bb8:		; preds = %bb, %entry
-	%p1.0.1 = phi int [ undef, %entry ], [ %tmp, %bb ]		; <int> [#uses=1]
-	%tmp.1 = phi sbyte* [ %tmp23, %entry ], [ %tmp, %bb ]		; <sbyte*> [#uses=1]
-	store sbyte* %tmp.1, sbyte** %memtmp
-	call void %llvm.va_copy( sbyte** %l2, sbyte** %memtmp )
-	%tmp10 = volatile load sbyte** %l2		; <sbyte*> [#uses=2]
-	%tmp12 = getelementptr sbyte* %tmp10, int 4		; <sbyte*> [#uses=1]
-	volatile store sbyte* %tmp12, sbyte** %l2
-	%tmp13 = cast sbyte* %tmp10 to int*		; <int*> [#uses=1]
-	%tmp14 = load int* %tmp13		; <int> [#uses=1]
-	%tmp17 = call int (ubyte*, ...)* %printf( ubyte* getelementptr ([7 x ubyte]* %str, int 0, uint 0), int %p1.0.1, int %tmp14 )		; <int> [#uses=0]
+	call void %llvm.va_copy( sbyte** %l2, sbyte** %l3 )
 	call void %llvm.va_end( sbyte** %l1 )
 	call void %llvm.va_end( sbyte** %l2 )
 	ret void


Index: llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll
diff -u llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll:1.1 llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll:1.2
--- llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll:1.1	Tue Jan 16 20:45:19 2007
+++ llvm/test/Assembler/2007-01-16-CrashOnBadCast.ll	Fri Jan 26 02:25:05 2007
@@ -2,7 +2,7 @@
 ; RUN: llvm-as < %s 2>&1 > /dev/null | \
 ; RUN:  grep "invalid cast opcode for cast from"
 
-define i8* %nada(i64 %X) {
+define i8* @nada(i64 %X) {
     %result = trunc i64 %X to i8*
     ret i8* %result
 }


Index: llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll
diff -u llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll:1.1 llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll:1.2
--- llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll:1.1	Tue Jan 16 20:45:19 2007
+++ llvm/test/Assembler/2007-01-16-CrashOnBadCast2.ll	Fri Jan 26 02:25:05 2007
@@ -2,4 +2,4 @@
 ; RUN: llvm-as < %s 2>&1 > /dev/null | \
 ; RUN:  grep "invalid cast opcode for cast from"
 
-%X = constant i8* trunc (i64 0 to i8*)
+ at X = constant i8* trunc (i64 0 to i8*)




