Remove llvm-upgrade and update tests.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47296 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGen/Generic/debug-info.ll b/test/CodeGen/Generic/debug-info.ll
index 49f693a..d1bb66d 100644
--- a/test/CodeGen/Generic/debug-info.ll
+++ b/test/CodeGen/Generic/debug-info.ll
@@ -1,19 +1,19 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc
-%lldb.compile_unit = type { uint, ushort, ushort, sbyte*, sbyte*, sbyte*, {  }* }
-%d.compile_unit7 = external global %lldb.compile_unit		; <%lldb.compile_unit*> [#uses=1]
+; RUN: llvm-as < %s | llc
 
-implementation   ; Functions:
+        %lldb.compile_unit = type { i32, i16, i16, i8*, i8*, i8*, {  }* }
+@d.compile_unit7 = external global %lldb.compile_unit           ; <%lldb.compile_unit*> [#uses=1]
 
-declare void %llvm.dbg.stoppoint(uint, uint, %lldb.compile_unit*)
+declare void @llvm.dbg.stoppoint(i32, i32, %lldb.compile_unit*)
 
-void %rb_raise(int, ...) {
+define void @rb_raise(i32, ...) {
 entry:
-	br bool false, label %strlen.exit, label %no_exit.i
+        br i1 false, label %strlen.exit, label %no_exit.i
 
-no_exit.i:		; preds = %entry
-	ret void
+no_exit.i:              ; preds = %entry
+        ret void
 
-strlen.exit:		; preds = %entry
-	call void %llvm.dbg.stoppoint(uint 4358, uint 0, %lldb.compile_unit* %d.compile_unit7 )		; <{  }*> [#uses=0]
-	unreachable
+strlen.exit:            ; preds = %entry
+        call void @llvm.dbg.stoppoint( i32 4358, i32 0, %lldb.compile_unit* @d.compile_unit7 )
+        unreachable
 }
+