averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[stdlib] Avoid storing NULL into a Builtin.RawPointer. (#2236)"

Browse Source 
This broke test sil-opt/emit-sib.swift with compiler asserts enabled.
https://ci.swift.org/job/oss-swift_tools-RA_stdlib-DA_test-simulator/1022/

This reverts commit 6b8cd5cba7.
This commit is contained in:
Greg Parker
2016-04-19 23:58:48 -07:00
parent abacf7e73d
commit a14a836caa
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
stdlib/public/core/StaticString.swift
View File

@@ -39,9 +39,12 @@ public struct StaticString
CustomDebugStringConvertible, CustomDebugStringConvertible,
CustomReflectable { CustomReflectable {
/// Either a pointer to the start of UTF-8 data, represented as an integer, // FIXME(ABI): RawPointer is non-nullable, but we can store a null Unicode
/// or an integer representation of a single Unicode scalar. // scalar in it. Change it to an integer.
internal var _startPtrOrData: Builtin.Word //
/// Either a pointer to the start of UTF-8 data, or an integer representation
/// of a single Unicode scalar.
internal var _startPtrOrData: Builtin.RawPointer
/// If `_startPtrOrData` is a pointer, contains the length of the UTF-8 data /// If `_startPtrOrData` is a pointer, contains the length of the UTF-8 data
/// in bytes. /// in bytes.
@@ -65,7 +68,7 @@ public struct StaticString
_precondition( _precondition(
hasPointerRepresentation, hasPointerRepresentation,
"StaticString should have pointer representation") "StaticString should have pointer representation")
return UnsafePointer(bitPattern: UInt(_startPtrOrData))! return UnsafePointer(_startPtrOrData)
} }
/// The stored Unicode scalar value. /// The stored Unicode scalar value.
@@ -76,7 +79,9 @@ public struct StaticString
_precondition( _precondition(
!hasPointerRepresentation, !hasPointerRepresentation,
"StaticString should have Unicode scalar representation") "StaticString should have Unicode scalar representation")
return UnicodeScalar(UInt32(UInt(_startPtrOrData))) return UnicodeScalar(
UInt32(UInt(bitPattern: UnsafePointer<Builtin.RawPointer>(_startPtrOrData)))
)
} }
/// If `self` stores a pointer to ASCII or UTF-8 code units, the /// If `self` stores a pointer to ASCII or UTF-8 code units, the
@@ -143,10 +148,7 @@ public struct StaticString
utf8CodeUnitCount: Builtin.Word, utf8CodeUnitCount: Builtin.Word,
isASCII: Builtin.Int1 isASCII: Builtin.Int1
) { ) {
// We don't go through UnsafePointer here to make things simpler for alias self._startPtrOrData = _start
// analysis. A higher-level algorithm may be trying to make sure an
// unrelated buffer is not accessed or freed.
self._startPtrOrData = Builtin.ptrtoint_Word(_start)
self._utf8CodeUnitCount = utf8CodeUnitCount self._utf8CodeUnitCount = utf8CodeUnitCount
self._flags = Bool(isASCII) ? (0x2 as UInt8)._value : (0x0 as UInt8)._value self._flags = Bool(isASCII) ? (0x2 as UInt8)._value : (0x0 as UInt8)._value
} }
@@ -156,7 +158,11 @@ public struct StaticString
internal init( internal init(
unicodeScalar: Builtin.Int32 unicodeScalar: Builtin.Int32
) { ) {
self._startPtrOrData = UInt(UInt32(unicodeScalar))._builtinWordValue self._startPtrOrData =
unsafeBitCast(
UInt(UInt32(unicodeScalar)),
to: OpaquePointer.self
)._rawValue
self._utf8CodeUnitCount = 0._builtinWordValue self._utf8CodeUnitCount = 0._builtinWordValue
self._flags = UnicodeScalar(_builtinUnicodeScalarLiteral: unicodeScalar).isASCII self._flags = UnicodeScalar(_builtinUnicodeScalarLiteral: unicodeScalar).isASCII
? (0x3 as UInt8)._value ? (0x3 as UInt8)._value