Remove llvm-upgrade and update tests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48137 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 6 insertions, 16 deletions

diff --git a/test/Linker/2004-05-07-TypeResolution2.ll b/test/Linker/2004-05-07-TypeResolution2.ll
index 05be611164..74fe39f4d9 100644
--- a/test/Linker/2004-05-07-TypeResolution2.ll
+++ b/test/Linker/2004-05-07-TypeResolution2.ll
@@ -1,25 +1,15 @@
 ; This file is used by testlink1.ll, so it doesn't actually do anything itself
 ;
 ; RUN: echo
-
-target endian = little
-target pointersize = 32
-
-  %myint = type ushort
+target datalayout = "e-p:32:32"
+	%myint = type i16
+	%struct1 = type { i32, void (%struct2*)*, i16*, i32 (i32*)* }
 	%struct2 = type { %struct1 }
-	%struct1 = type { int, void (%struct2*)*, %myint *, int (uint *)* }
-
-implementation   ; Functions:
 
-internal void %f1 (%struct1* %tty) {
+define internal void @f1(%struct1* %tty) {
 loopentry.preheader:
-
-  ; <void (%struct2*, ubyte)**> [#uses=1]
-  ; <void (%struct2*, ubyte)*> [#uses=0]
-
-	%tmp.2.i.i = getelementptr %struct1* %tty, uint 0, uint 1
-	%tmp.3.i.i = volatile load void (%struct2*)** %tmp.2.i.i
-
+	%tmp.2.i.i = getelementptr %struct1* %tty, i64 0, i32 1		; <void (%struct2*)**> [#uses=1]
+	%tmp.3.i.i = volatile load void (%struct2*)** %tmp.2.i.i		; <void (%struct2*)*> [#uses=0]
 	ret void
 }