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

[ASTGen] Avoid including C standard libary headers in brigdging headers

Browse Source 
C stdlib headers are part of "Darwin"/"Glibc" clang module.
If a Swift file imports a bridging headers and that has '#include'
C stdlib headers, Swift compiler implicitly imports "Darwin"/"Glibc"
overlay modules. That violates dependency layering. I.e. Compiler
depends on Darwin overlay, Darwin overlay is created by the compiler.

rdar://107957117
This commit is contained in:
Rintaro Ishizaki
2023-04-12 15:10:51 -07:00
parent 2bcef82eb5
commit fe1eb469e4
9 changed files with 102 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ASTGen/Sources/LLVMJSON/LLVMJSON.swift
View File

@@ -14,7 +14,7 @@ import CBasicBridging
extension String {
init(_ data: BridgedData) {
let buffer = UnsafeBufferPointer(start: data.baseAddress, count: data.size)
let buffer = UnsafeBufferPointer(start: data.baseAddress, count: Int(data.size))
self = buffer.withMemoryRebound(to: UInt8.self) { buffer in
String(decoding: buffer, as: UTF8.self)
}
@@ -35,13 +35,13 @@ public struct LLVMJSON {
JSON_value_serialize(valuePtr, &data)
assert(data.baseAddress != nil)
defer { BridgedData_free(data) }
let buffer = UnsafeBufferPointer(start: data.baseAddress, count: data.size)
let buffer = UnsafeBufferPointer(start: data.baseAddress, count: Int(data.size))
return try body(buffer)
}
/// Decode a JSON data to a Swift value.
public static func decode<T: Decodable>(_ type: T.Type, from json: UnsafeBufferPointer<Int8>) throws -> T {
let data = BridgedData(baseAddress: json.baseAddress, size: json.count)
let data = BridgedData(baseAddress: json.baseAddress, size: UInt(json.count))
let valuePtr = JSON_deserializedValue(data)
defer { JSON_value_delete(valuePtr) }
@@ -209,7 +209,7 @@ extension LLVMJSONDecoding.KeyedContainer: KeyedDecodingContainerProtocol {
var allKeys: [Key] {
var keys: [Key] = []
let size = JSON_object_getSize(objectPtr)
keys.reserveCapacity(size)
keys.reserveCapacity(Int(size))
for i in 0 ..< size {
let keyData = JSON_object_getKey(objectPtr, i)
if let key = Key(stringValue: String(keyData)) {