Merge pull request #4907 from atrick/fix

Author: swift-ci

stdlib/public/core/UnsafePointer.swift.gyb

@@ -373,13 +373,13 @@ public struct ${Self}<Pointee>
   /// - Precondition: The memory `self..<self + count * MemoryLayout<T>.stride`
   ///   is bound to `Pointee`.
   public func withMemoryRebound<T, Result>(to: T.Type, capacity count: Int,
-    _ body: (UnsafeMutablePointer<T>) throws -> Result
+    _ body: (${Self}<T>) throws -> Result
   ) rethrows -> Result {
     Builtin.bindMemory(_rawValue, count._builtinWordValue, T.self)
     defer {
       Builtin.bindMemory(_rawValue, count._builtinWordValue, Pointee.self)
     }
-    return try body(UnsafeMutablePointer<T>(_rawValue))
+    return try body(${Self}<T>(_rawValue))
   }
 
   /// Accesses the pointee at `self + i`.

test/stdlib/UnsafePointer.swift.gyb

@@ -457,12 +457,16 @@ ${SelfName}TestSuite.test("Comparable") {
 % for SelfName in ['UnsafePointer', 'UnsafeMutablePointer']:
 
 ${SelfName}TestSuite.test("withMemoryRebound") {
-  let mutablePtr = UnsafeMutablePointer<Int>.allocate(capacity: 4)
-  let ptrI = ${SelfName}<Int>(mutablePtr)
+  let mutablePtrI = UnsafeMutablePointer<Int>.allocate(capacity: 4)
+  defer { mutablePtrI.deallocate(capacity: 4) }
+  let ptrI = ${SelfName}<Int>(mutablePtrI)
   ptrI.withMemoryRebound(to: UInt.self, capacity: 4) {
-    expectType(UInt.self, &$0.pointee)
+    // Make sure the closure argument isa $SelfName
+    var ptrU: ${SelfName}<UInt> = $0
+    // and that the element type is UInt.
+    var mutablePtrU = UnsafeMutablePointer(mutating: ptrU)
+    expectType(UInt.self, &mutablePtrU.pointee)
   }
-  mutablePtr.deallocate(capacity: 4)
 }
 
 % end