Merge pull request #22995 from eeckstein/fix-ubp-test-5.1

[5.1]  Fix a unit test for 32-bit platforms.

Author: eeckstein

test/SILOptimizer/unsafebufferpointer.swift

@@ -56,10 +56,9 @@ public func testCount(_ x: UnsafeBufferPointer<UInt>) -> Int {
 //
 // CHECK: ; <label>:[[LOOP]]:
 // CHECK: phi float [ 0.000000e+00
-// CHECK: add nuw i64 %{{.*}}, 1
 // CHECK: load float, float*
 // CHECK: fadd float
-// CHECK: [[CMP:%[0-9]+]] = icmp eq i64 %{{.*}}, %{{.*}}
+// CHECK: [[CMP:%[0-9]+]] = icmp eq
 // CHECK: br i1 [[CMP]], label %.loopexit, label %[[LOOP]]
 public func testSubscript(_ ubp: UnsafeBufferPointer<Float>) -> Float {
   var sum: Float = 0
@@ -80,17 +79,15 @@ public func testSubscript(_ ubp: UnsafeBufferPointer<Float>) -> Float {
 //
 // CHECK: ; <label>:[[LOOP]]:
 // CHECK: phi i64 [ 0
-// CHECK: phi i64 [ 0
-// CHECK: add nuw i64 %{{.*}}, 1
 // CHECK: load i8, i8*
 // CHECK: zext i8 %{{.*}} to i64
 // CHECK: add i64
-// CHECK: [[CMP:%[0-9]+]] = icmp eq i64 %{{.*}}, %{{.*}}
+// CHECK: [[CMP:%[0-9]+]] = icmp eq
 // CHECK: br i1 [[CMP]], label %[[RET]], label %[[LOOP]]
-public func testSubscript(_ ubp: UnsafeRawBufferPointer) -> Int {
-  var sum: Int = 0
+public func testSubscript(_ ubp: UnsafeRawBufferPointer) -> Int64 {
+  var sum: Int64 = 0
   for i in 0 ..< ubp.count {
-    sum &+= Int(ubp[i])
+    sum &+= Int64(ubp[i])
   }
   return sum
 }