Skip to content

Commit 09fe05f

Browse files
rintarorintaro
committed
Eliminate SyntaxArena.default
SyntaxArena.default was a global arena which just leaked. Eliminate it, and make all Syntax factory/modifier API use a new arena. rdar://101894396
1 parent e44e18c commit 09fe05f

20 files changed

+12530
-10728
lines changed

‎Sources/SwiftSyntax/Raw/RawSyntax.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ extension RawSyntax {
219219
/// If the syntax tree did not contain a token and thus no trivia could be attached to it, `nil` is returned.
220220
/// - Parameters:
221221
/// - leadingTrivia: The trivia to attach.
222-
func withLeadingTrivia(_ leadingTrivia: Trivia) -> RawSyntax? {
222+
func withLeadingTrivia(_ leadingTrivia: Trivia, arena: SyntaxArena) -> RawSyntax? {
223223
switch view {
224224
case .token(let tokenView):
225225
return .makeMaterializedToken(
@@ -229,7 +229,7 @@ extension RawSyntax {
229229
arena: arena)
230230
case .layout(let layoutView):
231231
for (index, child) in layoutView.children.enumerated() {
232-
if let replaced = child?.withLeadingTrivia(leadingTrivia) {
232+
if let replaced = child?.withLeadingTrivia(leadingTrivia, arena: arena) {
233233
return layoutView.replacingChild(at: index, with: replaced, arena: arena)
234234
}
235235
}
@@ -241,7 +241,7 @@ extension RawSyntax {
241241
/// If the syntax tree did not contain a token and thus no trivia could be attached to it, `nil` is returned.
242242
/// - Parameters:
243243
/// - trailingTrivia: The trivia to attach.
244-
func withTrailingTrivia(_ trailingTrivia: Trivia) -> RawSyntax? {
244+
func withTrailingTrivia(_ trailingTrivia: Trivia, arena: SyntaxArena) -> RawSyntax? {
245245
switch view {
246246
case .token(let tokenView):
247247
return .makeMaterializedToken(
@@ -251,7 +251,7 @@ extension RawSyntax {
251251
arena: arena)
252252
case .layout(let layoutView):
253253
for (index, child) in layoutView.children.enumerated().reversed() {
254-
if let replaced = child?.withTrailingTrivia(trailingTrivia) {
254+
if let replaced = child?.withTrailingTrivia(trailingTrivia, arena: arena) {
255255
return layoutView.replacingChild(at: index, with: replaced, arena: arena)
256256
}
257257
}

‎Sources/SwiftSyntax/Raw/RawSyntaxTokenView.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,24 +151,24 @@ public struct RawSyntaxTokenView {
151151
/// Returns a `RawSyntax` node with the same source text but with the token
152152
/// kind changed to `newValue`.
153153
@_spi(RawSyntax)
154-
public func withKind(_ newValue: TokenKind) -> RawSyntax {
154+
public func withKind(_ newValue: TokenKind, arena: SyntaxArena) -> RawSyntax {
155155
switch raw.rawData.payload {
156156
case .parsedToken(_):
157157
// The wholeText can't be continuous anymore. Make a materialized token.
158158
return .makeMaterializedToken(
159159
kind: newValue,
160160
leadingTrivia: formLeadingTrivia(),
161161
trailingTrivia: formTrailingTrivia(),
162-
arena: raw.arena)
162+
arena: arena)
163163
case .materializedToken(var payload):
164164
let decomposed = newValue.decomposeToRaw()
165165
let rawKind = decomposed.rawKind
166-
let text: SyntaxText = (decomposed.string.map({raw.arena.intern($0)}) ??
166+
let text: SyntaxText = (decomposed.string.map({arena.intern($0)}) ??
167167
decomposed.rawKind.defaultText ??
168168
"")
169169
payload.tokenKind = rawKind
170170
payload.tokenText = text
171-
return RawSyntax(arena: raw.arena, payload: .materializedToken(payload))
171+
return RawSyntax(arena: arena, payload: .materializedToken(payload))
172172
default:
173173
preconditionFailure("'withTokenKind()' is called on non-token raw syntax")
174174
}

‎Sources/SwiftSyntax/Syntax.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,13 +482,13 @@ public extension SyntaxProtocol {
482482
/// Returns a new syntax node with its leading trivia replaced
483483
/// by the provided trivia.
484484
func withLeadingTrivia(_ leadingTrivia: Trivia) -> Self {
485-
return Self(Syntax(data.withLeadingTrivia(leadingTrivia)))!
485+
return Self(Syntax(data.withLeadingTrivia(leadingTrivia, arena: SyntaxArena())))!
486486
}
487487

488488
/// Returns a new syntax node with its trailing trivia replaced
489489
/// by the provided trivia.
490490
func withTrailingTrivia(_ trailingTrivia: Trivia) -> Self {
491-
return Self(Syntax(data.withTrailingTrivia(trailingTrivia)))!
491+
return Self(Syntax(data.withTrailingTrivia(trailingTrivia, arena: SyntaxArena())))!
492492
}
493493

494494
/// Returns a new syntax node with its leading trivia removed.

‎Sources/SwiftSyntax/SyntaxArena.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,6 @@ struct SyntaxArenaRef: Equatable {
250250
}
251251
}
252252

253-
extension SyntaxArena {
254-
// FIXME: This is only for migration. All clients should move to "arena" model.
255-
//@available(*, deprecated, message: ".default SyntaxArena is subject to remove soon")
256-
public static let `default` = SyntaxArena()
257-
}
258-
259253
private func _defaultParseTriviaFunction(_ source: SyntaxText, _ position: TriviaPosition) -> [RawTriviaPiece] {
260254
preconditionFailure("Trivia parsing not supported")
261255
}

‎Sources/SwiftSyntax/SyntaxCollections.swift.gyb

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,11 @@ public struct ${node.name}: SyntaxCollection, SyntaxHashable {
118118
}
119119

120120
public init(_ children: [Element]) {
121-
let raw = RawSyntax.makeLayout(kind: SyntaxKind.${node.swift_syntax_kind},
122-
from: children.map { $0.raw }, arena: .default)
123-
let data = SyntaxData.forRoot(raw)
121+
let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in
122+
let raw = RawSyntax.makeLayout(kind: SyntaxKind.${node.swift_syntax_kind},
123+
from: children.map { $0.raw }, arena: arena)
124+
return SyntaxData.forRoot(raw)
125+
}
124126
self.init(data)
125127
}
126128

@@ -135,8 +137,9 @@ public struct ${node.name}: SyntaxCollection, SyntaxHashable {
135137
/// - Returns: A new `${node.name}` with the new layout underlying it.
136138
internal func replacingLayout(
137139
_ layout: [RawSyntax?]) -> ${node.name} {
138-
let newRaw = layoutView.replacingLayout(with: layout, arena: .default)
139-
let newData = data.replacingSelf(newRaw)
140+
let arena = SyntaxArena()
141+
let newRaw = layoutView.replacingLayout(with: layout, arena: arena)
142+
let newData = data.replacingSelf(newRaw, arena: arena)
140143
return ${node.name}(newData)
141144
}
142145

@@ -228,13 +231,13 @@ public struct ${node.name}: SyntaxCollection, SyntaxHashable {
228231
/// Returns a new `${node.name}` with its leading trivia replaced
229232
/// by the provided trivia.
230233
public func withLeadingTrivia(_ leadingTrivia: Trivia) -> ${node.name} {
231-
return ${node.name}(data.withLeadingTrivia(leadingTrivia))
234+
return ${node.name}(data.withLeadingTrivia(leadingTrivia, arena: SyntaxArena()))
232235
}
233236

234237
/// Returns a new `${node.name}` with its trailing trivia replaced
235238
/// by the provided trivia.
236239
public func withTrailingTrivia(_ trailingTrivia: Trivia) -> ${node.name} {
237-
return ${node.name}(data.withTrailingTrivia(trailingTrivia))
240+
return ${node.name}(data.withTrailingTrivia(trailingTrivia, arena: SyntaxArena()))
238241
}
239242

240243
/// Returns a new `${node.name}` with its leading trivia removed.

‎Sources/SwiftSyntax/SyntaxData.swift

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,11 @@ struct SyntaxData {
325325
/// - parameter newRaw: The new RawSyntax that will back the new `Data`
326326
/// - returns: A tuple of both the new root node and the new data with the raw
327327
/// layout replaced.
328-
func replacingSelf(
329-
_ newRaw: RawSyntax) -> SyntaxData {
328+
func replacingSelf(_ newRaw: RawSyntax, arena: SyntaxArena) -> SyntaxData {
330329
// If we have a parent already, then ask our current parent to copy itself
331330
// recursively up to the root.
332331
if let parent = parent {
333-
let parentData = parent.replacingChild(newRaw, at: indexInParent)
332+
let parentData = parent.replacingChild(newRaw, at: indexInParent, arena: arena)
334333
let newParent = Syntax(parentData)
335334
return SyntaxData(absoluteRaw.replacingSelf(newRaw, newRootId: parentData.nodeId.rootId), parent: newParent)
336335
} else {
@@ -349,22 +348,22 @@ struct SyntaxData {
349348
/// - Returns: The new root node created by this operation, and the new child
350349
/// syntax data.
351350
/// - SeeAlso: replacingSelf(_:)
352-
func replacingChild(_ child: RawSyntax?, at index: Int) -> SyntaxData {
353-
let newRaw = raw.layoutView!.replacingChild(at: index, with: child, arena: .default)
354-
return replacingSelf(newRaw)
351+
func replacingChild(_ child: RawSyntax?, at index: Int, arena: SyntaxArena) -> SyntaxData {
352+
let newRaw = raw.layoutView!.replacingChild(at: index, with: child, arena: arena)
353+
return replacingSelf(newRaw, arena: arena)
355354
}
356355

357-
func withLeadingTrivia(_ leadingTrivia: Trivia) -> SyntaxData {
358-
if let raw = raw.withLeadingTrivia(leadingTrivia) {
359-
return replacingSelf(raw)
356+
func withLeadingTrivia(_ leadingTrivia: Trivia, arena: SyntaxArena) -> SyntaxData {
357+
if let raw = raw.withLeadingTrivia(leadingTrivia, arena: arena) {
358+
return replacingSelf(raw, arena: arena)
360359
} else {
361360
return self
362361
}
363362
}
364363

365-
func withTrailingTrivia(_ trailingTrivia: Trivia) -> SyntaxData {
366-
if let raw = raw.withTrailingTrivia(trailingTrivia) {
367-
return replacingSelf(raw)
364+
func withTrailingTrivia(_ trailingTrivia: Trivia, arena: SyntaxArena) -> SyntaxData {
365+
if let raw = raw.withTrailingTrivia(trailingTrivia, arena: arena) {
366+
return replacingSelf(raw, arena: arena)
368367
} else {
369368
return self
370369
}

‎Sources/SwiftSyntax/SyntaxFactory.swift.gyb

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,16 @@ public enum SyntaxFactory {
3232
public static func makeToken(_ kind: TokenKind, presence: SourcePresence,
3333
leadingTrivia: Trivia = [],
3434
trailingTrivia: Trivia = []) -> TokenSyntax {
35-
let raw = RawSyntax.makeMaterializedToken(kind: kind, leadingTrivia: leadingTrivia,
36-
trailingTrivia: trailingTrivia, presence: presence, arena: .default)
37-
let data = SyntaxData.forRoot(raw)
38-
return TokenSyntax(data)
35+
TokenSyntax(
36+
kind,
37+
leadingTrivia: leadingTrivia,
38+
trailingTrivia: trailingTrivia,
39+
presence: presence)
3940
}
4041

4142
@available(*, deprecated, message: "Use initializer on UnknownSyntax")
4243
public static func makeUnknownSyntax(tokens: [TokenSyntax]) -> UnknownSyntax {
43-
let raw = RawSyntax.makeLayout(kind: .unknown,
44-
from: tokens.map { $0.raw }, arena: .default)
45-
let data = SyntaxData.forRoot(raw)
46-
return UnknownSyntax(data)
44+
UnknownSyntax(tokens: tokens)
4745
}
4846

4947
/// MARK: Syntax Node Creation APIs
@@ -78,37 +76,43 @@ public enum SyntaxFactory {
7876
% end
7977
% end
8078
]
81-
let raw = RawSyntax.makeLayout(kind: SyntaxKind.${node.swift_syntax_kind},
82-
from: layout, arena: .default)
83-
let data = SyntaxData.forRoot(raw)
84-
return ${node.name}(data)
79+
return withExtendedLifetime(SyntaxArena()) { arena in
80+
let raw = RawSyntax.makeLayout(kind: SyntaxKind.${node.swift_syntax_kind},
81+
from: layout, arena: arena)
82+
let data = SyntaxData.forRoot(raw)
83+
return ${node.name}(data)
84+
}
8585
}
8686
% elif node.is_syntax_collection():
8787
@available(*, deprecated, message: "Use initializer on ${node.name}")
8888
public static func make${node.syntax_kind}(
8989
_ elements: [${node.collection_element_type}]) -> ${node.name} {
90-
let raw = RawSyntax.makeLayout(kind: SyntaxKind.${node.swift_syntax_kind},
91-
from: elements.map { $0.raw }, arena: .default)
92-
let data = SyntaxData.forRoot(raw)
93-
return ${node.name}(data)
90+
return withExtendedLifetime(SyntaxArena()) { arena in
91+
let raw = RawSyntax.makeLayout(kind: SyntaxKind.${node.swift_syntax_kind},
92+
from: elements.map { $0.raw }, arena: arena)
93+
let data = SyntaxData.forRoot(raw)
94+
return ${node.name}(data)
95+
}
9496
}
9597
% end
9698

9799
% if not node.is_base():
98100
% default_presence = 'missing' if node.is_missing() else 'present'
99101
@available(*, deprecated, message: "Use initializer on ${node.name}")
100102
public static func makeBlank${node.syntax_kind}(presence: SourcePresence = .${default_presence}) -> ${node.name} {
101-
let data = SyntaxData.forRoot(RawSyntax.makeLayout(kind: .${node.swift_syntax_kind},
102-
from: [
103+
return withExtendedLifetime(SyntaxArena()) { arena in
104+
let data = SyntaxData.forRoot(RawSyntax.makeLayout(kind: .${node.swift_syntax_kind},
105+
from: [
103106
% for child in node.children:
104107
% if child.is_optional:
105-
nil,
108+
nil,
106109
% else:
107-
${make_missing_swift_child(child)},
110+
${make_missing_swift_child(child)},
108111
% end
109112
% end
110-
], arena: .default))
111-
return ${node.name}(data)
113+
], arena: arena))
114+
return ${node.name}(data)
115+
}
112116
}
113117
% end
114118
% end

‎Sources/SwiftSyntax/SyntaxNodes.swift.gyb.template

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public struct ${node.name}: ${base_type}Protocol, SyntaxHashable {
126126
% else:
127127
${child.swift_name}: ${param_type}${comma}
128128
% end
129-
% end
129+
% end
130130
) {
131131
let layout: [RawSyntax?] = [
132132
% for child in node.children:
@@ -137,9 +137,11 @@ public struct ${node.name}: ${base_type}Protocol, SyntaxHashable {
137137
% end
138138
% end
139139
]
140-
let raw = RawSyntax.makeLayout(kind: SyntaxKind.${node.swift_syntax_kind},
141-
from: layout, arena: .default)
142-
let data = SyntaxData.forRoot(raw)
140+
let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in
141+
let raw = RawSyntax.makeLayout(kind: SyntaxKind.${node.swift_syntax_kind},
142+
from: layout, arena: arena)
143+
return SyntaxData.forRoot(raw)
144+
}
143145
self.init(data)
144146
}
145147
% for (idx, child) in enumerate(node.children):
@@ -190,13 +192,14 @@ public struct ${node.name}: ${base_type}Protocol, SyntaxHashable {
190192
/// appended to its `${child.swift_name}` collection.
191193
public func add${child_elt}(_ element: ${child_elt_type}) -> ${node.name} {
192194
var collection: RawSyntax
195+
let arena = SyntaxArena()
193196
if let col = raw.layoutView!.children[${idx}] {
194-
collection = col.layoutView!.appending(element.raw, arena: .default)
197+
collection = col.layoutView!.appending(element.raw, arena: arena)
195198
} else {
196199
collection = RawSyntax.makeLayout(kind: SyntaxKind.${child_node.swift_syntax_kind},
197-
from: [element.raw], arena: .default)
200+
from: [element.raw], arena: arena)
198201
}
199-
let newData = data.replacingChild(collection, at: ${idx})
202+
let newData = data.replacingChild(collection, at: ${idx}, arena: arena)
200203
return ${node.name}(newData)
201204
}
202205
% end
@@ -207,14 +210,14 @@ public struct ${node.name}: ${base_type}Protocol, SyntaxHashable {
207210
/// Returns a copy of the receiver with its `${child.swift_name}` replaced.
208211
/// - param newChild: The new `${child.swift_name}` to replace the node's
209212
/// current `${child.swift_name}`, if present.
210-
public func with${child.name}(
211-
_ newChild: ${child_type}?) -> ${node.name} {
213+
public func with${child.name}(_ newChild: ${child_type}?) -> ${node.name} {
214+
let arena = SyntaxArena()
212215
% if child.is_optional:
213216
let raw = newChild?.raw
214217
% else:
215218
let raw = newChild?.raw ?? ${make_missing_swift_child(child)}
216219
% end
217-
let newData = data.replacingChild(raw, at: ${idx})
220+
let newData = data.replacingChild(raw, at: ${idx}, arena: arena)
218221
return ${node.name}(newData)
219222
}
220223
% end

‎Sources/SwiftSyntax/SyntaxOtherNodes.swift

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ public struct UnknownSyntax: SyntaxProtocol, SyntaxHashable {
3232
}
3333

3434
public init(tokens: [TokenSyntax]) {
35-
let raw = RawSyntax.makeLayout(kind: .unknown,
36-
from: tokens.map { $0.raw }, arena: .default)
37-
let data = SyntaxData.forRoot(raw)
35+
let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in
36+
let raw = RawSyntax.makeLayout(kind: .unknown,
37+
from: tokens.map { $0.raw }, arena: arena)
38+
return SyntaxData.forRoot(raw)
39+
}
3840
self.init(data)
3941
}
4042

@@ -85,14 +87,16 @@ public struct TokenSyntax: SyntaxProtocol, SyntaxHashable {
8587
trailingTrivia: Trivia = [],
8688
presence: SourcePresence
8789
) {
88-
let raw = RawSyntax.makeMaterializedToken(
89-
kind: kind,
90-
leadingTrivia: leadingTrivia,
91-
trailingTrivia: trailingTrivia,
92-
presence: presence,
93-
arena: .default
94-
)
95-
let data = SyntaxData.forRoot(raw)
90+
let data: SyntaxData = withExtendedLifetime(SyntaxArena()) { arena in
91+
let raw = RawSyntax.makeMaterializedToken(
92+
kind: kind,
93+
leadingTrivia: leadingTrivia,
94+
trailingTrivia: trailingTrivia,
95+
presence: presence,
96+
arena: arena
97+
)
98+
return SyntaxData.forRoot(raw)
99+
}
96100
self.init(data)
97101
}
98102

@@ -115,8 +119,9 @@ public struct TokenSyntax: SyntaxProtocol, SyntaxHashable {
115119
guard raw.kind == .token else {
116120
fatalError("TokenSyntax must have token as its raw")
117121
}
118-
let newRaw = tokenView.withKind(tokenKind)
119-
let newData = data.replacingSelf(newRaw)
122+
let arena = SyntaxArena()
123+
let newRaw = tokenView.withKind(tokenKind, arena: arena)
124+
let newData = data.replacingSelf(newRaw, arena: arena)
120125
return TokenSyntax(newData)
121126
}
122127

@@ -126,7 +131,7 @@ public struct TokenSyntax: SyntaxProtocol, SyntaxHashable {
126131
guard raw.kind == .token else {
127132
fatalError("TokenSyntax must have token as its raw")
128133
}
129-
return TokenSyntax(data.withLeadingTrivia(leadingTrivia))
134+
return TokenSyntax(data.withLeadingTrivia(leadingTrivia, arena: SyntaxArena()))
130135
}
131136

132137
/// Returns a new TokenSyntax with its trailing trivia replaced
@@ -135,7 +140,7 @@ public struct TokenSyntax: SyntaxProtocol, SyntaxHashable {
135140
guard raw.kind == .token else {
136141
fatalError("TokenSyntax must have token as its raw")
137142
}
138-
return TokenSyntax(data.withTrailingTrivia(trailingTrivia))
143+
return TokenSyntax(data.withTrailingTrivia(trailingTrivia, arena: SyntaxArena()))
139144
}
140145

141146
/// Returns a new TokenSyntax with its leading trivia removed.

0 commit comments

Comments
 (0)