Skip to content

Commit 2bae6a1

Browse files
committed
---
yaml --- r: 343036 b: refs/heads/master-rebranch c: 88630e8 h: refs/heads/master
1 parent 86a380a commit 2bae6a1

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
14551455
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
14561456
refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
14571457
refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
1458-
refs/heads/master-rebranch: b9e3ada255404eeb0d93c8637a2321607f9551a0
1458+
refs/heads/master-rebranch: 88630e8ea31f3e61e1b3dd70fbab95a5ae305bd9
14591459
refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
14601460
refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
14611461
refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/stdlib/public/core/BridgeObjectiveC.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ public struct AutoreleasingUnsafeMutablePointer<Pointee /* TODO : class */>
392392
// an extra twist, `Pointee` is allowed (but not required) to be an
393393
// optional type, so we actually need to load it as an optional, and
394394
// explicitly handle the nil case.
395-
let unmanaged = UnsafeRawPointer(_rawValue)
396-
.load(as: Optional<Unmanaged<AnyObject>>.self)
395+
let unmanaged =
396+
UnsafePointer<Optional<Unmanaged<AnyObject>>>(_rawValue).pointee
397397
return unsafeBitCast(
398398
unmanaged?.takeUnretainedValue(),
399399
to: Pointee.self)
@@ -413,9 +413,8 @@ public struct AutoreleasingUnsafeMutablePointer<Pointee /* TODO : class */>
413413
} else {
414414
unmanaged = nil
415415
}
416-
UnsafeMutableRawPointer(_rawValue).storeBytes(
417-
of: unmanaged,
418-
as: Optional<Unmanaged<AnyObject>>.self)
416+
UnsafeMutablePointer<Optional<Unmanaged<AnyObject>>>(_rawValue).pointee =
417+
unmanaged
419418
}
420419
}
421420

0 commit comments

Comments
 (0)