diff --git a/test/CodeGen/Generic/llvm-ct-intrinsics.ll b/test/CodeGen/Generic/llvm-ct-intrinsics.ll
index db2e4b19697..014d261c521 100644
--- a/test/CodeGen/Generic/llvm-ct-intrinsics.ll
+++ b/test/CodeGen/Generic/llvm-ct-intrinsics.ll
@@ -1,59 +1,59 @@
 ; Make sure this testcase is supported by all code generators
 ; RUN: llvm-upgrade < %s | llvm-as | llc
 
-declare uint %llvm.ctpop.i64(ulong)
+declare ulong %llvm.ctpop.i64(ulong)
 declare uint %llvm.ctpop.i32(uint)
-declare uint %llvm.ctpop.i16(ushort)
-declare uint %llvm.ctpop.i8(ubyte)
+declare ushort %llvm.ctpop.i16(ushort)
+declare ubyte %llvm.ctpop.i8(ubyte)
 
 void %ctpoptest(ubyte %A, ushort %B, uint %C, ulong %D, 
-                uint *%AP, uint* %BP, uint* %CP, uint* %DP) {
-	%a = call uint %llvm.ctpop.i8(ubyte %A)
-	%b = call uint %llvm.ctpop.i16(ushort %B)
+                ubyte *%AP, ushort* %BP, uint* %CP, ulong* %DP) {
+	%a = call ubyte %llvm.ctpop.i8(ubyte %A)
+	%b = call ushort %llvm.ctpop.i16(ushort %B)
 	%c = call uint %llvm.ctpop.i32(uint %C)
-	%d = call uint %llvm.ctpop.i64(ulong %D)
+	%d = call ulong %llvm.ctpop.i64(ulong %D)
 
-	store uint %a, uint* %AP
-	store uint %b, uint* %BP
-	store uint %c, uint* %CP
-	store uint %d, uint* %DP
+	store ubyte %a, ubyte* %AP
+	store ushort %b, ushort* %BP
+	store uint   %c, uint* %CP
+	store ulong  %d, ulong* %DP
 	ret void
 }
 
-declare uint %llvm.ctlz.i64(ulong)
+declare ulong %llvm.ctlz.i64(ulong)
 declare uint %llvm.ctlz.i32(uint)
-declare uint %llvm.ctlz.i16(ushort)
-declare uint %llvm.ctlz.i8(ubyte)
+declare ushort %llvm.ctlz.i16(ushort)
+declare ubyte %llvm.ctlz.i8(ubyte)
 
 void %ctlztest(ubyte %A, ushort %B, uint %C, ulong %D, 
-               uint *%AP, uint* %BP, uint* %CP, uint* %DP) {
-	%a = call uint %llvm.ctlz.i8(ubyte %A)
-	%b = call uint %llvm.ctlz.i16(ushort %B)
+               ubyte *%AP, ushort* %BP, uint* %CP, ulong* %DP) {
+	%a = call ubyte %llvm.ctlz.i8(ubyte %A)
+	%b = call ushort %llvm.ctlz.i16(ushort %B)
 	%c = call uint %llvm.ctlz.i32(uint %C)
-	%d = call uint %llvm.ctlz.i64(ulong %D)
+	%d = call ulong %llvm.ctlz.i64(ulong %D)
 
-	store uint %a, uint* %AP
-	store uint %b, uint* %BP
-	store uint %c, uint* %CP
-	store uint %d, uint* %DP
+	store ubyte %a, ubyte* %AP
+	store ushort %b, ushort* %BP
+	store uint   %c, uint* %CP
+	store ulong  %d, ulong* %DP
 	ret void
 }
 
-declare uint %llvm.cttz.i64(ulong)
+declare ulong %llvm.cttz.i64(ulong)
 declare uint %llvm.cttz.i32(uint)
-declare uint %llvm.cttz.i16(ushort)
-declare uint %llvm.cttz.i8(ubyte)
+declare ushort %llvm.cttz.i16(ushort)
+declare ubyte %llvm.cttz.i8(ubyte)
 
 void %cttztest(ubyte %A, ushort %B, uint %C, ulong %D, 
-               uint *%AP, uint* %BP, uint* %CP, uint* %DP) {
-	%a = call uint %llvm.cttz.i8(ubyte %A)
-	%b = call uint %llvm.cttz.i16(ushort %B)
+               ubyte *%AP, ushort* %BP, uint* %CP, ulong* %DP) {
+	%a = call ubyte %llvm.cttz.i8(ubyte %A)
+	%b = call ushort %llvm.cttz.i16(ushort %B)
 	%c = call uint %llvm.cttz.i32(uint %C)
-	%d = call uint %llvm.cttz.i64(ulong %D)
+	%d = call ulong %llvm.cttz.i64(ulong %D)
 
-	store uint %a, uint* %AP
-	store uint %b, uint* %BP
-	store uint %c, uint* %CP
-	store uint %d, uint* %DP
+	store ubyte %a, ubyte* %AP
+	store ushort %b, ushort* %BP
+	store uint   %c, uint* %CP
+	store ulong  %d, ulong* %DP
 	ret void
 }
diff --git a/test/Transforms/InstCombine/bswap-fold.ll b/test/Transforms/InstCombine/bswap-fold.ll
index 146a4495c91..0ee486ad1aa 100644
--- a/test/Transforms/InstCombine/bswap-fold.ll
+++ b/test/Transforms/InstCombine/bswap-fold.ll
@@ -2,25 +2,25 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*bswap'
 
 bool %test1(ushort %tmp2) {
-	%tmp10 = call ushort %llvm.bswap.i16.i16( ushort %tmp2 )		
+	%tmp10 = call ushort %llvm.bswap.i16( ushort %tmp2 )		
 	%tmp = seteq ushort %tmp10, 1		
 	ret bool %tmp
 }
 
 bool %test2(uint %tmp) {
-	%tmp34 = tail call uint %llvm.bswap.i32.i32( uint %tmp )		
+	%tmp34 = tail call uint %llvm.bswap.i32( uint %tmp )		
 	%tmp = seteq uint %tmp34, 1		
 	ret bool %tmp
 }
 
+declare uint %llvm.bswap.i32(uint)
+
 bool %test3(ulong %tmp) {
-	%tmp34 = tail call ulong %llvm.bswap.i64.i64( ulong %tmp )		
+	%tmp34 = tail call ulong %llvm.bswap.i64( ulong %tmp )		
 	%tmp = seteq ulong %tmp34, 1		
 	ret bool %tmp
 }
 
-declare ulong %llvm.bswap.i64.i64(ulong)
+declare ulong %llvm.bswap.i64(ulong)
 
-declare ushort %llvm.bswap.i16.i16(ushort)
-
-declare uint %llvm.bswap.i32.i32(uint)
+declare ushort %llvm.bswap.i16(ushort)