Skip to content

Commit 087a799

Browse files
committed
---
yaml --- r: 318367 b: refs/heads/master-rebranch c: 814a28f h: refs/heads/master i: 318365: 205efd2 318363: 321fdc8 318359: 59abe9d 318351: 3c37800 318335: 113fbb2
1 parent 97a33b8 commit 087a799

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
14571457
refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
14581458
refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
14591459
refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
1460-
refs/heads/master-rebranch: c99da10924b5c5f246808082dc41def5397578e2
1460+
refs/heads/master-rebranch: 814a28fb9458d3c9b19b67fe80775aee3ad01fd4

branches/master-rebranch/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public func _stdlib_thread_create_block<Argument, Result>(
9696
if threadID == 0 {
9797
return (errno, nil)
9898
} else {
99-
return (0, UnsafeMutablePointer<ThreadHandle>(&threadID).pointee)
99+
return (0, unsafeBitCast(threadID, to: ThreadHandle.self))
100100
}
101101
#else
102102
var threadID = _make_pthread_t()

branches/master-rebranch/test/Interpreter/dynamic_replacement_dlclose.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
// RUN: %target-codesign %t/main %t/%target-library-name(Module1) %t/%target-library-name(Module2)
66
// RUN: %target-run %t/main %t/%target-library-name(Module1) %t/%target-library-name(Module2)
77

8+
// REQUIRES: executable_test
9+
810
import Module1
911

1012
import StdlibUnittest

0 commit comments

Comments
 (0)