Skip to content

Commit a23e061

Browse files
committed
tbs
1 parent ae7d5d1 commit a23e061

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

lib/AST/Decl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8703,7 +8703,7 @@ ParamDecl *ParamDecl::createParsed(
87038703
// TODO: However, we may want to retain its location for diagnostics.
87048704
defaultValue = nullptr;
87058705
}
8706-
assert(defaultValueInitContext);
8706+
ASSERT(defaultValueInitContext);
87078707
decl->setDefaultExpr(defaultValue);
87088708
decl->setDefaultArgumentKind(kind);
87098709
if (defaultValue)
@@ -9251,7 +9251,7 @@ ParamDecl::setDefaultValueStringRepresentation(StringRef stringRepresentation) {
92519251
}
92529252

92539253
void DefaultArgumentInitializer::changeFunction(DeclContext *parent) {
9254-
assert(parent->isLocalContext());
9254+
ASSERT(parent->isLocalContext());
92559255
setParent(parent);
92569256
}
92579257

lib/ASTGen/Sources/ASTGen/ParameterClause.swift

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ extension ASTGenVisitor {
156156
let initContext: BridgedDefaultArgumentInitializer?
157157
let initExpr: BridgedExpr?
158158
if let defaultValue = node.defaultValue {
159-
// Create the initializer context with the current context (not the function).
160-
// The context will be
159+
// Create the initializer using the current DeclContext (not the function).
160+
// The context will be reset to the function later via 'ParameterList::setDeclContextOfParamDecls()'.
161161
initContext = BridgedDefaultArgumentInitializer.create(declContext: self.declContext, index: index)
162162
initExpr = self.withDeclContext(initContext!.asDeclContext) {
163163
self.generate(expr: defaultValue.value)
@@ -167,6 +167,7 @@ extension ASTGenVisitor {
167167
initExpr = nil
168168
}
169169

170+
// The decl context will be reset to the function later.
170171
let param = BridgedParamDecl.createParsed(
171172
self.ctx,
172173
declContext: self.declContext,
@@ -218,6 +219,7 @@ extension ASTGenVisitor {
218219
for context: ParameterContext
219220
) -> BridgedParameterList {
220221
var params: [BridgedParamDecl] = []
222+
params.reserveCapacity(node.parameters.count)
221223
for (index, node) in node.parameters.enumerated() {
222224
let param = self.generate(functionParameter: node, for: context, at: index)
223225
params.append(param)
@@ -233,6 +235,7 @@ extension ASTGenVisitor {
233235

234236
func generate(enumCaseParameterClause node: EnumCaseParameterClauseSyntax) -> BridgedParameterList {
235237
var params: [BridgedParamDecl] = []
238+
params.reserveCapacity(node.parameters.count)
236239
for (index, node) in node.parameters.enumerated() {
237240
let param = self.generate(enumCaseParameter: node, at: index)
238241
params.append(param)
@@ -270,7 +273,7 @@ extension ASTGenVisitor {
270273

271274
func generate(closureParameterClause node: ClosureParameterClauseSyntax) -> BridgedParameterList {
272275
var params: [BridgedParamDecl] = []
273-
276+
params.reserveCapacity(node.parameters.count)
274277
for (index, node) in node.parameters.enumerated() {
275278
let param = self.generate(closureParameter: node, at: index)
276279
param.setSpecifier(.default)

0 commit comments

Comments
 (0)