Skip to content

stdlib: Address #StrictMemorySafety and unreachable code warnings #80501

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 2 commits into from
Apr 3, 2025
Merged

stdlib: Address #StrictMemorySafety and unreachable code warnings #80501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d32310f
stdlib: Address new #StrictMemorySafety warnings.
tshortli Apr 3, 2025
14e0eed
stdlib: Address unreachable code warnings.
tshortli Apr 3, 2025
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
8 changes: 4 additions & 4 deletions stdlib/public/core/StringBridge.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ private func _stdlib_binary_createIndirectTaggedPointerNSString(
ptr: UnsafePointer<UInt8>,
count: Int
) -> UnsafeRawPointer? {
return _swift_stdlib_CreateIndirectTaggedPointerString(ptr, count);
return unsafe _swift_stdlib_CreateIndirectTaggedPointerString(ptr, count);
}

@usableFromInline // @testable
Expand Down Expand Up @@ -631,12 +631,12 @@ extension String {
}
if _guts._object.isImmortal && !_guts._object.largeFastIsConstantCocoa {
if _guts.isASCII && _guts._object.isFastZeroTerminated {
let ptr = _guts._object.fastUTF8.baseAddress!
let ptr = unsafe _guts._object.fastUTF8.baseAddress!
let count = _guts.count
if let indirect = _stdlib_binary_createIndirectTaggedPointerNSString(
if let indirect = unsafe _stdlib_binary_createIndirectTaggedPointerNSString(
ptr: ptr, count: count
) {
return unsafeBitCast(indirect, to: AnyObject.self)
return unsafe unsafeBitCast(indirect, to: AnyObject.self)
}
}
let gutsCountAndFlags = _guts._object._countAndFlags
Expand Down
8 changes: 4 additions & 4 deletions stdlib/public/core/StringUTF8View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,11 +345,11 @@ extension String.UTF8View {
#endif
let count = _guts.count
if _guts.isSmall {
let a = Builtin.addressOfBorrow(self)
let address = unsafe UnsafePointer<UTF8.CodeUnit>(a)
let span = unsafe Span(_unsafeStart: address, count: count)
fatalError("Span over the small string form is not supported yet.")
return unsafe _overrideLifetime(span, borrowing: self)
// let a = Builtin.addressOfBorrow(self)
// let address = unsafe UnsafePointer<UTF8.CodeUnit>(a)
// let span = unsafe Span(_unsafeStart: address, count: count)
// return unsafe _overrideLifetime(span, borrowing: self)
}
_precondition(_guts.isFastUTF8)
let buffer = unsafe _guts._object.fastUTF8
Expand Down
12 changes: 6 additions & 6 deletions stdlib/public/core/Substring.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,19 +782,19 @@ extension Substring.UTF8View {
let base: String.UTF8View = self._base
let first = base._foreignDistance(from: base.startIndex, to: startIndex)
let count = base._foreignDistance(from: startIndex, to: endIndex)
let span = unsafe base.span._extracting(first..<(first &+ count))
let span = base.span._extracting(first..<(first &+ count))
return unsafe _overrideLifetime(span, borrowing: self)
}
#endif
let first = _slice._startIndex._encodedOffset
let end = _slice._endIndex._encodedOffset
if _wholeGuts.isSmall {
let a = Builtin.addressOfBorrow(self)
let offset = first &+ (2 &* MemoryLayout<String.Index>.stride)
let start = unsafe UnsafePointer<UTF8.CodeUnit>(a).advanced(by: offset)
let span = unsafe Span(_unsafeStart: start, count: end &- first)
fatalError("Span over the small string form is not supported yet.")
return unsafe _overrideLifetime(span, borrowing: self)
// let a = Builtin.addressOfBorrow(self)
// let offset = first &+ (2 &* MemoryLayout<String.Index>.stride)
// let start = unsafe UnsafePointer<UTF8.CodeUnit>(a).advanced(by: offset)
// let span = unsafe Span(_unsafeStart: start, count: end &- first)
// return unsafe _overrideLifetime(span, borrowing: self)
}
_internalInvariant(_wholeGuts.isFastUTF8)
var span = unsafe Span(_unsafeElements: _wholeGuts._object.fastUTF8)
Expand Down