commit 9ea73cc647aa132698570d927e515ec6b399cf86
author swift-ci <swift-ci@users.noreply.github.com> Thu Jun 22 11:24:30 2017 -0700
committer swift-ci <swift-ci@users.noreply.github.com> Thu Jun 22 11:24:30 2017 -0700
tree fcfacf4758d8b48ecf77b90244067b887874dce4
parent 7e3d6b18c86a694106e6a1d2b8d50b64d15341d1
parent b0d6766e2cc62fdc33c7769d8c3bb5b61bc84587

Merge remote-tracking branch 'origin/swift-4.0-branch' into stable

lib/CodeGen/CGExpr.cpp

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 135c4e4..d11171c 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -2958,7 +2958,7 @@
                                     const llvm::Twine &name = "arrayidx") {
   if (inbounds) {
     return CGF.EmitCheckedInBoundsGEP(
-        ptr, indices, signedIndices, CodeGenFunction::IsSubtraction, loc, name);
+        ptr, indices, signedIndices, CodeGenFunction::NotSubtraction, loc, name);
   } else {
     return CGF.Builder.CreateGEP(ptr, indices, name);
   }

test/CodeGen/ubsan-pointer-overflow.m

diff --git a/test/CodeGen/ubsan-pointer-overflow.m b/test/CodeGen/ubsan-pointer-overflow.m
index 8b9633d..977e245 100644
--- a/test/CodeGen/ubsan-pointer-overflow.m
+++ b/test/CodeGen/ubsan-pointer-overflow.m
@@ -126,8 +126,10 @@
 
 // CHECK-LABEL: define void @pointer_array_unsigned_indices
 void pointer_array_unsigned_indices(int **arr, unsigned k) {
+  // CHECK: icmp uge
   // CHECK-NOT: select
   // CHECK: call void @__ubsan_handle_pointer_overflow{{.*}}
+  // CHECK: icmp uge
   // CHECK-NOT: select
   // CHECK: call void @__ubsan_handle_pointer_overflow{{.*}}
   arr[k][k];