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

[ClangImporter] Don't assume inner pointers are nullable.

Browse Source 
Some inner pointers are explicitly annotated as _Nonnull, and we
should believe that. This is important when passing, say, pointers
to arrays.
This commit is contained in:
Jordan Rose
2016-04-04 13:12:11 -07:00
parent 55b20d42d7
commit 315761c4cf
9 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
stdlib/public/SDK/Foundation/NSStringAPI.swift
View File

@@ -383,18 +383,28 @@ extension String {
public func completePath(
into outputName: UnsafeMutablePointer<String>? = nil,
caseSensitive: Bool,
matchesInto matchesIntoArray: UnsafeMutablePointer<[String]>? = nil,
matchesInto outputArray: UnsafeMutablePointer<[String]>? = nil,
filterTypes: [String]? = nil
) -> Int {
var nsMatches: NSArray?
var nsOutputName: NSString?
let result = outputName._withNilOrAddress(of: &nsOutputName) {
outputName in matchesIntoArray._withNilOrAddress(of: &nsMatches) {
matchesIntoArray in
self._ns.completePath(
into: outputName, caseSensitive: caseSensitive,
matchesInto: matchesIntoArray, filterTypes: filterTypes
let result: Int = outputName._withNilOrAddress(of: &nsOutputName) {
outputName in outputArray._withNilOrAddress(of: &nsMatches) {
outputArray in
// FIXME: completePath(...) is incorrectly annotated as requiring
// non-optional output parameters. rdar://problem/25494184
let outputNonOptionalName = AutoreleasingUnsafeMutablePointer<NSString>(
UnsafeMutablePointer<NSString>(outputName)
)
let outputNonOptionalArray = AutoreleasingUnsafeMutablePointer<NSArray>(
UnsafeMutablePointer<NSArray>(outputArray)
)
return self._ns.completePath(
into: outputNonOptionalName,
caseSensitive: caseSensitive,
matchesInto: outputNonOptionalArray,
filterTypes: filterTypes
)
}
}
@@ -402,7 +412,7 @@ extension String {
if let matches = nsMatches {
// Since this function is effectively a bridge thunk, use the
// bridge thunk semantics for the NSArray conversion
matchesIntoArray?.pointee = matches as! [String]
outputArray?.pointee = matches as! [String]
}
if let n = nsOutputName {