Move variable into closure

Author: Azoy

stdlib/public/core/KeyPath.swift

@@ -326,8 +326,6 @@ public class KeyPath<Root, Value>: PartialKeyPath<Root> {
       }
     }
 
-    var currentType = rootType
-
     return withBuffer {
       var buffer = $0
 
@@ -366,6 +364,8 @@ public class KeyPath<Root, Value>: PartialKeyPath<Root> {
           $0.initializeElement(at: 0, to: root)
         }
 
+        var currentType = rootType
+
         while true {
           let (rawComponent, optNextType) = buffer.next()
           let newType = optNextType ?? valueType

stdlib/public/core/TemporaryAllocation.swift

@@ -84,7 +84,7 @@ internal func _isStackAllocationSafe(byteCount: Int, alignment: Int) -> Bool {
   // without worrying about running out of space, and the compiler would emit
   // such allocations on the stack anyway when they represent structures or
   // stack-promoted objects.
-  if byteCount <= 1024 {
+  if _fastPath(byteCount <= 1024) {
     return true
   }
 
@@ -169,7 +169,8 @@ internal func _withUnprotectedUnsafeTemporaryAllocation<T, R>(
   _ body: (Builtin.RawPointer) throws -> R
 ) rethrows -> R {
   // How many bytes do we need to allocate?
-  let byteCount = _byteCountForTemporaryAllocation(of: type, capacity: capacity)
+  //let byteCount = _byteCountForTemporaryAllocation(of: type, capacity: capacity)
+  let byteCount = MemoryLayout<T>.stride &* capacity
 
   guard _isStackAllocationSafe(byteCount: byteCount, alignment: alignment) else {
     return try _fallBackToHeapAllocation(byteCount: byteCount, alignment: alignment, body)
@@ -293,7 +294,7 @@ public func _withUnprotectedUnsafeTemporaryAllocation<R>(
     alignment: alignment
   ) { pointer in
     let buffer = UnsafeMutableRawBufferPointer(
-      start: .init(pointer),
+      _uncheckedStart: .init(pointer),
       count: byteCount
     )
     return try body(buffer)
@@ -369,7 +370,7 @@ public func _withUnprotectedUnsafeTemporaryAllocation<T, R>(
   ) { pointer in
     Builtin.bindMemory(pointer, capacity._builtinWordValue, type)
     let buffer = UnsafeMutableBufferPointer<T>(
-      start: .init(pointer),
+      _uncheckedStart: .init(pointer),
       count: capacity
     )
     return try body(buffer)

stdlib/public/core/UnsafeRawBufferPointer.swift.gyb

@@ -115,6 +115,21 @@ public struct Unsafe${Mutable}RawBufferPointer {
     _debugPrecondition(count >= 0, "${Self} with negative count")
     _debugPrecondition(count == 0 || start != nil,
       "${Self} has a nil start and nonzero count")
+
+    self.init(_uncheckedStart: start, count: count)
+  }
+
+  @_alwaysEmitIntoClient
+  internal init(
+    _uncheckedStart start: Unsafe${Mutable}RawPointer?,
+    count: Int
+  ) {
+    _internalInvariant(count >= 0, "${Self} with negative count")
+    _internalInvariant(
+      count == 0 || start != nil,
+      "${Self} has a nil start and nonzero count"
+    )
+
     _position = start
     _end = start.map { $0 + _assumeNonNegative(count) }
   }
@@ -1264,7 +1279,12 @@ public func _withUnprotectedUnsafeBytes<T, Result>(
 ) rethrows -> Result
 {
   return try _withUnprotectedUnsafePointer(to: &value) {
-    try body(UnsafeRawBufferPointer(start: $0, count: MemoryLayout<T>.size))
+    try body(
+      UnsafeRawBufferPointer(
+        _uncheckedStart: $0,
+        count: MemoryLayout<T>.size
+      )
+    )
   }
 }
 
@@ -1312,7 +1332,10 @@ public func _withUnprotectedUnsafeBytes<T, Result>(
 #else
   let addr = UnsafeRawPointer(Builtin.addressOfBorrow(value))
 #endif
-  let buffer = UnsafeRawBufferPointer(start: addr, count: MemoryLayout<T>.size)
+  let buffer = UnsafeRawBufferPointer(
+    _uncheckedStart: addr,
+    count: MemoryLayout<T>.size
+  )
   return try body(buffer)
 }