Skip to content

Commit 31cc217

Browse files
committed
fix vararg _fixed_layout
1 parent e824967 commit 31cc217

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

stdlib/public/core/VarArgs.swift

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -387,11 +387,9 @@ extension Double : _CVarArgPassedAsDouble, _CVarArgAligned {
387387

388388
/// An object that can manage the lifetime of storage backing a
389389
/// `CVaListPointer`.
390-
@_fixed_layout // FIXME(sil-serialize-all)
391-
@_fixed_layout // c-abi
390+
@_fixed_layout
392391
@usableFromInline // c-abi
393392
final internal class _VaListBuilder {
394-
395393
@_fixed_layout // c-abi
396394
@usableFromInline
397395
internal struct Header {
@@ -409,6 +407,17 @@ final internal class _VaListBuilder {
409407
internal var reg_save_area: UnsafeMutablePointer<Int>?
410408
}
411409

410+
@usableFromInline // c-abi
411+
internal var gpRegistersUsed = 0
412+
@usableFromInline // c-abi
413+
internal var fpRegistersUsed = 0
414+
415+
@usableFromInline // c-abi
416+
final // Property must be final since it is used by Builtin.addressof.
417+
internal var header = Header()
418+
@usableFromInline // c-abi
419+
internal var storage: ContiguousArray<Int>
420+
412421
@inlinable // c-abi
413422
internal init() {
414423
// prepare the register save area
@@ -469,25 +478,13 @@ final internal class _VaListBuilder {
469478
_fromUnsafeMutablePointer: UnsafeMutableRawPointer(
470479
Builtin.addressof(&self.header)))
471480
}
472-
473-
@usableFromInline // c-abi
474-
internal var gpRegistersUsed = 0
475-
@usableFromInline // c-abi
476-
internal var fpRegistersUsed = 0
477-
478-
@usableFromInline // c-abi
479-
final // Property must be final since it is used by Builtin.addressof.
480-
internal var header = Header()
481-
@usableFromInline // c-abi
482-
internal var storage: ContiguousArray<Int>
483481
}
484482

485483
#else
486484

487485
/// An object that can manage the lifetime of storage backing a
488486
/// `CVaListPointer`.
489-
@_fixed_layout // FIXME(sil-serialize-all)
490-
@_fixed_layout // c-abi
487+
@_fixed_layout
491488
@usableFromInline // c-abi
492489
final internal class _VaListBuilder {
493490

0 commit comments

Comments
 (0)