diff --git a/test/IRGen/annotated_cond_fail.swift b/test/IRGen/annotated_cond_fail.swift
index bb754384aa3c9..ef50e578426da 100644
--- a/test/IRGen/annotated_cond_fail.swift
+++ b/test/IRGen/annotated_cond_fail.swift
@@ -19,7 +19,7 @@ public func test(_ a: [Int], _ i: Int) -> Int {
 
 // CHECK:  [[SIZE_ADDR:%.*]] = getelementptr
 // CHECK:  [[SIZE:%.*]] = load i64, ptr [[SIZE_ADDR]]
-// CHECK:  [[C1:%.*]] = icmp ult i64 [[IDX]], [[SIZE]]
+// CHECK:  [[C1:%.*]] = icmp samesign ult i64 [[IDX]], [[SIZE]]
 // CHECK:  br i1 [[C1]], {{.*}}!annotation ![[ARRAY_INDEX_OUT_OF_BOUNDS]]
 
 
diff --git a/test/IRGen/argument_attrs.sil b/test/IRGen/argument_attrs.sil
index 905842f443816..bba5ed69b1869 100644
--- a/test/IRGen/argument_attrs.sil
+++ b/test/IRGen/argument_attrs.sil
@@ -16,7 +16,7 @@ entry(%1 : $*Builtin.Int32, %2 : $*Builtin.Int32, %3 : $*Builtin.Int32, %4 : $Hu
   return undef : $()
 }
 
-// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl(ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias nocapture, ptr)
+// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl(ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias captures(none), ptr)
 sil @arguments_in_decl : $@convention(thin) <T> (@inout Builtin.Int32, @in Builtin.Int32, @in_guaranteed Builtin.Int32, Huge, @in T, @in ()) -> ()
 
 // CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @arguments_in_def_out(ptr noalias captures(none) sret({{.*}}) %0, ptr captures(none) dereferenceable(4) %1, ptr noalias captures(none) dereferenceable(4) %2, ptr noalias captures(none) dereferenceable(4) %3, ptr noalias captures(none) dereferenceable(40) %4, ptr noalias %5, ptr noalias captures(none) %6, ptr %T)
@@ -31,7 +31,7 @@ entry(%0 : $*Builtin.Int32, %1 : $*Builtin.Int32, %2 : $*Builtin.Int32, %3 : $*B
   return undef : $()
 }
 
-// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl_out(ptr noalias captures(none) sret({{.*}}), ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias nocapture, ptr)
+// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl_out(ptr noalias captures(none) sret({{.*}}), ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias captures(none), ptr)
 sil @arguments_in_decl_out : $@convention(thin) <T> (@inout Builtin.Int32, @in Builtin.Int32, @in_guaranteed Builtin.Int32, Huge, @in T, @in ()) -> @out Builtin.Int32
 
 // CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @arguments_in_def_huge_ret(ptr noalias captures(none) sret({{.*}}V) %0, ptr captures(none) dereferenceable(4) %1, ptr noalias captures(none) dereferenceable(4) %2, ptr noalias captures(none) dereferenceable(4) %3, ptr noalias captures(none) dereferenceable(40) %4, ptr noalias %5, ptr noalias captures(none) %6, ptr %T)
@@ -46,7 +46,7 @@ entry(%1 : $*Builtin.Int32, %2 : $*Builtin.Int32, %3 : $*Builtin.Int32, %4 : $Hu
   return %y : $Huge
 }
 
-// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl_huge_ret(ptr noalias captures(none) sret({{.*}}), ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias nocapture, ptr)
+// CHECK-LABEL: declare{{( dllimport)?}} swiftcc void @arguments_in_decl_huge_ret(ptr noalias captures(none) sret({{.*}}), ptr captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(4), ptr noalias captures(none) dereferenceable(40), ptr noalias, ptr noalias captures(none), ptr)
 sil @arguments_in_decl_huge_ret : $@convention(thin) <T> (@inout Builtin.Int32, @in Builtin.Int32, @in_guaranteed Builtin.Int32, Huge, @in T, @in ()) -> Huge
 
 
diff --git a/test/IRGen/integer-comparison.swift b/test/IRGen/integer-comparison.swift
index ac7d4677ce13a..d5052c461cf4c 100644
--- a/test/IRGen/integer-comparison.swift
+++ b/test/IRGen/integer-comparison.swift
@@ -4,11 +4,11 @@
 func f(_ x: Int, _ y: UInt32) -> Bool { x < y }
 // CHECK-LABEL: define {{.*}} @"$s4main1fySbSi_s6UInt32VtF"(i64 %0, i32 %1)
 // CHECK: %2 = zext i32 %1 to i64
-// CHECK-NEXT: %3 = icmp sgt i64 %2, %0
+// CHECK-NEXT: %3 = icmp slt i64 %0, %2
 // CHECK-NEXT: ret i1 %3
 
 func g(_ x: UInt32, _ y: Int) -> Bool { x < y }
 // CHECK-LABEL: define {{.*}} @"$s4main1gySbs6UInt32V_SitF"(i32 %0, i64 %1)
 // CHECK: %2 = zext i32 %0 to i64
-// CHECK-NEXT: %3 = icmp slt i64 %2, %1
+// CHECK-NEXT: %3 = icmp sgt i64 %1, %2
 // CHECK-NEXT: ret i1 %3
diff --git a/test/LLVMPasses/allocation-deletion.ll b/test/LLVMPasses/allocation-deletion.ll
index c9db70bf7a6db..3dc2ebb2ad3f7 100644
--- a/test/LLVMPasses/allocation-deletion.ll
+++ b/test/LLVMPasses/allocation-deletion.ll
@@ -7,7 +7,7 @@ target triple = "x86_64-apple-macosx10.9"
 %swift.heapmetadata = type { ptr, ptr }
 
 declare ptr @swift_allocObject(ptr , i64, i64) nounwind
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 declare void @swift_retain(ptr ) nounwind
 declare { i64, i64, i64 } @swift_retainAndReturnThree(ptr , i64, i64 , i64 )
 
@@ -36,7 +36,7 @@ entry:
 ; trivial_alloc_eliminate1 - Show that we can eliminate an allocation with a
 ; trivial destructor.
 @trivial_dtor_metadata = internal constant %swift.heapmetadata { ptr @trivial_dtor, ptr null }
-define internal i64 @trivial_dtor(ptr nocapture) nounwind readonly {
+define internal i64 @trivial_dtor(ptr captures(none)) nounwind readonly {
 entry:
   %1 = getelementptr inbounds %swift.refcounted, ptr %0, i64 1
   %length = load i64, ptr %1, align 8
diff --git a/test/LLVMPasses/basic.ll b/test/LLVMPasses/basic.ll
index be8b54b3e16dc..f53e1f9fc66a1 100644
--- a/test/LLVMPasses/basic.ll
+++ b/test/LLVMPasses/basic.ll
@@ -16,7 +16,7 @@ declare void @swift_unknownObjectRelease(ptr)
 declare ptr @llvm.objc.retain(ptr)
 declare void @llvm.objc.release(ptr)
 declare ptr @swift_allocObject(ptr , i64, i64) nounwind
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 declare ptr @swift_retain(ptr returned) nounwind
 declare ptr @swift_bridgeObjectRetain(ptr)
 declare void @swift_bridgeObjectRelease(ptr)
diff --git a/test/LLVMPasses/contract.ll b/test/LLVMPasses/contract.ll
index d5081e5c9e3f9..23c05a02096b3 100644
--- a/test/LLVMPasses/contract.ll
+++ b/test/LLVMPasses/contract.ll
@@ -10,9 +10,9 @@ target triple = "x86_64-apple-macosx10.9"
 declare ptr @swift_allocObject(ptr , i64, i64) nounwind
 declare ptr @swift_bridgeObjectRetain(ptr)
 declare void @swift_bridgeObjectRelease(ptr )
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 declare ptr @swift_retain(ptr ) nounwind
-declare void @swift_unknownObjectRelease(ptr nocapture)
+declare void @swift_unknownObjectRelease(ptr captures(none))
 declare ptr @swift_unknownObjectRetain(ptr ) nounwind
 declare void @__swift_fixLifetime(ptr)
 declare void @noread_user(ptr) readnone
diff --git a/test/LLVMPasses/crash.ll b/test/LLVMPasses/crash.ll
index 020ce65262495..1aa748c1a9254 100644
--- a/test/LLVMPasses/crash.ll
+++ b/test/LLVMPasses/crash.ll
@@ -8,7 +8,7 @@ target triple = "x86_64-apple-macosx10.9"
 
 declare { ptr, i64, ptr } @_Tsop1pFT3lhsNs6String3rhsS__S_(ptr, i64, ptr, ptr, i64, ptr)
 declare { ptr, i64, ptr } @_TNs6String24convertFromStringLiteralFT3valp_S_(ptr)
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 
 
 @0 = private unnamed_addr constant [3 x i8] c"So\00"
diff --git a/test/LLVMPasses/disable_llvm_optzns.ll b/test/LLVMPasses/disable_llvm_optzns.ll
index e71f22ae88a5f..c0a4ba020c4bd 100644
--- a/test/LLVMPasses/disable_llvm_optzns.ll
+++ b/test/LLVMPasses/disable_llvm_optzns.ll
@@ -16,7 +16,7 @@ declare void @swift_unknownObjectRelease(ptr)
 declare ptr @llvm.objc.retain(ptr)
 declare void @llvm.objc.release(ptr)
 declare ptr @swift_allocObject(ptr , i64, i64) nounwind
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 declare ptr @swift_retain(ptr returned) nounwind
 declare ptr @swift_bridgeObjectRetain(ptr)
 declare void @swift_bridgeObjectRelease(ptr)
diff --git a/test/LLVMPasses/missing_runtime_declarations.ll b/test/LLVMPasses/missing_runtime_declarations.ll
index 3b5c20414afc0..f20263bc8472f 100644
--- a/test/LLVMPasses/missing_runtime_declarations.ll
+++ b/test/LLVMPasses/missing_runtime_declarations.ll
@@ -3,11 +3,11 @@
 target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-apple-macosx10.9"
 
-; CHECK: declare void @swift_bridgeObjectRelease(ptr nocapture)
+; CHECK: declare void @swift_bridgeObjectRelease(ptr captures(none))
 
 %a = type opaque
-declare void @swift_bridgeObjectRelease(ptr nocapture)
-declare ptr @swift_bridgeObjectRetain(ptr nocapture)
+declare void @swift_bridgeObjectRelease(ptr captures(none))
+declare ptr @swift_bridgeObjectRetain(ptr captures(none))
 
 ; CHECK-LABEL: define void @testcase1(ptr %0) {
 ; CHECK: entry:
diff --git a/test/LLVMPasses/release_motion_landingpad.ll b/test/LLVMPasses/release_motion_landingpad.ll
index 3a3c5ae4045f9..f6bee19d82dc5 100644
--- a/test/LLVMPasses/release_motion_landingpad.ll
+++ b/test/LLVMPasses/release_motion_landingpad.ll
@@ -3,7 +3,7 @@
 target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-apple-macosx10.9"
 
-declare void @swift_release(ptr nocapture)
+declare void @swift_release(ptr captures(none))
 declare void @swift_retain(ptr) nounwind
 declare ptr @_Znwm(i64)
 declare i32 @__gxx_personality_v0(...)