Merge pull request #2370 from swiftix/new-indexing-model-regression-fixes

Fix some Array-related performance regressions introduced by the new …

Author: swiftix

stdlib/public/core/Arrays.swift.gyb

@@ -503,6 +503,88 @@ public struct ${Self}<Element>
 %end
   }
 
+  @warn_unused_result
+  public func index(after i: Int) -> Int {
+    // NOTE: this is a manual specialization of index movement for a Strideable
+    // index that is required for Array performance.  The optimizer is not
+    // capable of creating partial specializations yet.
+    // NOTE: Range checks are not performed here, because it is done later by
+    // the subscript function.
+    return i + 1
+  }
+
+  public func formIndex(after i: inout Int) {
+    // NOTE: this is a manual specialization of index movement for a Strideable
+    // index that is required for Array performance.  The optimizer is not
+    // capable of creating partial specializations yet.
+    // NOTE: Range checks are not performed here, because it is done later by
+    // the subscript function.
+    i += 1
+  }
+
+  @warn_unused_result
+  public func index(before i: Int) -> Int {
+    // NOTE: this is a manual specialization of index movement for a Strideable
+    // index that is required for Array performance.  The optimizer is not
+    // capable of creating partial specializations yet.
+    // NOTE: Range checks are not performed here, because it is done later by
+    // the subscript function.
+    return i - 1
+  }
+
+  public func formIndex(before i: inout Int) {
+    // NOTE: this is a manual specialization of index movement for a Strideable
+    // index that is required for Array performance.  The optimizer is not
+    // capable of creating partial specializations yet.
+    // NOTE: Range checks are not performed here, because it is done later by
+    // the subscript function.
+    i -= 1
+  }
+
+  @warn_unused_result
+  public func index(_ i: Int, offsetBy n: Int) -> Int {
+    // NOTE: this is a manual specialization of index movement for a Strideable
+    // index that is required for Array performance.  The optimizer is not
+    // capable of creating partial specializations yet.
+    // NOTE: Range checks are not performed here, because it is done later by
+    // the subscript function.
+    return i + n
+  }
+
+  @warn_unused_result
+  public func index(
+    _ i: Int, offsetBy n: Int, limitedBy limit: Int
+  ) -> Int? {
+    // NOTE: this is a manual specialization of index movement for a Strideable
+    // index that is required for Array performance.  The optimizer is not
+    // capable of creating partial specializations yet.
+    // NOTE: Range checks are not performed here, because it is done later by
+    // the subscript function.
+    let l = limit - i
+    if n > 0 ? l >= 0 && l < n : l <= 0 && n < l {
+      return nil
+    }
+    return i + n
+  }
+
+  @warn_unused_result
+  public func distance(from start: Int, to end: Int) -> Int {
+    // NOTE: this is a manual specialization of index movement for a Strideable
+    // index that is required for Array performance.  The optimizer is not
+    // capable of creating partial specializations yet.
+    // NOTE: Range checks are not performed here, because it is done later by
+    // the subscript function.
+    return end - start
+  }
+
+  public func _failEarlyRangeCheck(_ index: Int, bounds: Range<Int>) {
+    // NOTE: This method is a no-op for performance reasons.
+  }
+
+  public func _failEarlyRangeCheck(_ range: Range<Int>, bounds: Range<Int>) {
+    // NOTE: This method is a no-op for performance reasons.
+  }
+
   public typealias Indices = CountableRange<Int>
 
 %{

stdlib/public/core/RandomAccessCollection.swift

@@ -81,8 +81,9 @@ extension RandomAccessIndexable {
   func index(
     i: Index, offsetBy n: IndexDistance, limitedBy limit: Index
   ) -> Index? {
+    // FIXME: swift-3-indexing-model: tests.
     let l = distance(from: i, to: limit)
-    if n > 0 ? l > 0 && l < n : l <= 0 && n < l {
+    if n > 0 ? l >= 0 && l < n : l <= 0 && n < l {
       return nil
     }
     return index(i, offsetBy: n)