Skip to content

Commit b7c1062

Browse files
committed
Merge remote-tracking branch 'origin/master' into master-next
2 parents 7a8aa16 + fafd21e commit b7c1062

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

tools/swift-reflection-test/swift-reflection-test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ static
200200
PipeMemoryReader createPipeMemoryReader() {
201201
PipeMemoryReader Reader;
202202
#if defined(_WIN32)
203-
if (pipe(Reader.to_child, 256, _O_BINARY))
203+
if (_pipe(Reader.to_child, 256, _O_BINARY))
204204
errnoAndExit("Couldn't create pipes to child process");
205-
if (pipe(Reader.from_child, 256, _O_BINARY))
205+
if (_pipe(Reader.from_child, 256, _O_BINARY))
206206
errnoAndExit("Couldn't create pipes from child process");
207207
#else
208208
if (pipe(Reader.to_child))

unittests/runtime/Stdlib.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ void *$ss32_getErrorEmbeddedNSErrorIndirectyyXlSgSPyxGs0B0RzlF(void *) {
180180
SWIFT_RUNTIME_STDLIB_INTERNAL
181181
const long long $SkMp[1] = {0};
182182

183+
SWIFT_RUNTIME_STDLIB_INTERNAL
184+
const long long $sSHMp[1] = {0};
185+
183186
// Array
184187

185188
SWIFT_RUNTIME_STDLIB_INTERNAL
@@ -190,11 +193,17 @@ const long long $sSaMn[1] = {0};
190193
SWIFT_RUNTIME_STDLIB_INTERNAL
191194
const long long $ssSdVMn[1] = {0};
192195

196+
SWIFT_RUNTIME_STDLIB_INTERNAL
197+
const long long $sSDMn[1] = {0};
198+
193199
// Set
194200

195201
SWIFT_RUNTIME_STDLIB_INTERNAL
196202
const long long $ssSeVMn[1] = {0};
197203

204+
SWIFT_RUNTIME_STDLIB_INTERNAL
205+
const long long $sShMn[1] = {0};
206+
198207
// Mirror
199208

200209
// protocol witness table for Swift._ClassSuperMirror : Swift._Mirror in Swift
@@ -273,3 +282,8 @@ MANGLE_SYM(s20_playgroundPrintHookySScSgvg)() {
273282
return {nullptr, nullptr};
274283
}
275284

285+
// ObjectiveC Bridgeable
286+
287+
SWIFT_RUNTIME_STDLIB_INTERNAL
288+
const long long $ss21_ObjectiveCBridgeableMp[1] = {0};
289+

0 commit comments

Comments
 (0)