Skip to content

[4.2] stdlib: Fix some @_inlineable/Builtin.addressof bad interactions. #15634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 31, 2018
Merged

[4.2] stdlib: Fix some @_inlineable/Builtin.addressof bad interactions. #15634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions stdlib/public/core/StringObject.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,13 @@ extension _StringObject {
//

#if arch(i386) || arch(arm)
@_versioned // FIXME(sil-serialize-all)
internal var _emptyStringStorage: UInt32 = 0

@_inlineable // FIXME(sil-serialize-all)
// NB: This function *cannot* be @inlinable because it expects to project
// and escape the physical storage of `_emptyStringStorage`.
// Marking it inlinable will cause it to resiliently use accessors to
// project `_emptyStringStorage` as a computed
// property.
@_versioned // FIXME(sil-serialize-all)
internal var _emptyStringAddressBits: UInt {
let p = UnsafeRawPointer(Builtin.addressof(&_emptyStringStorage))
Expand Down
7 changes: 5 additions & 2 deletions stdlib/public/core/VarArgs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,11 @@ final internal class _VaListBuilder {
appendWords(arg._cVarArgEncoding)
}

@_inlineable // FIXME(sil-serialize-all)
// NB: This function *cannot* be @inlinable because it expects to project
// and escape the physical storage of `_VaListBuilder.alignedStorageForEmptyVaLists`.
// Marking it inlinable will cause it to resiliently use accessors to
// project `_VaListBuilder.alignedStorageForEmptyVaLists` as a computed
// property.
@_versioned // FIXME(sil-serialize-all)
internal func va_list() -> CVaListPointer {
// Use Builtin.addressof to emphasize that we are deliberately escaping this
Expand Down Expand Up @@ -587,7 +591,6 @@ final internal class _VaListBuilder {
@_versioned // FIXME(sil-serialize-all)
internal var storage: UnsafeMutablePointer<Int>?

@_versioned // FIXME(sil-serialize-all)
internal static var alignedStorageForEmptyVaLists: Double = 0
}

Expand Down