Skip to content

[AST] Preserve source location in packIntoImplicitTupleOrParen #39522

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 1 commit into from
Sep 30, 2021
Merged

[AST] Preserve source location in packIntoImplicitTupleOrParen #39522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions lib/AST/ArgumentList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,28 +220,35 @@ Optional<unsigned> ArgumentList::findArgumentExpr(Expr *expr,
Expr *ArgumentList::packIntoImplicitTupleOrParen(
ASTContext &ctx, llvm::function_ref<Type(Expr *)> getType) const {
assert(!hasAnyInOutArgs() && "Cannot construct bare tuple/paren with inout");

// Make sure to preserve the source location info here and below as it may be
// needed for e.g serialization of its textual representation.
if (auto *unary = getUnlabeledUnaryExpr()) {
auto *paren = new (ctx) ParenExpr(SourceLoc(), unary, SourceLoc());
auto *paren = new (ctx) ParenExpr(getLParenLoc(), unary, getRParenLoc());
if (auto ty = getType(unary))
paren->setType(ParenType::get(ctx, ty));
paren->setImplicit();
return paren;
}

SmallVector<Expr *, 8> argExprs;
SmallVector<Identifier, 8> argLabels;
SmallVector<TupleTypeElt, 8> tupleEltTypes;
SmallVector<Expr *, 2> argExprs;
SmallVector<Identifier, 2> argLabels;
SmallVector<SourceLoc, 2> argLabelLocs;
SmallVector<TupleTypeElt, 2> tupleEltTypes;

for (auto arg : *this) {
auto *argExpr = arg.getExpr();
argExprs.push_back(argExpr);
argLabels.push_back(arg.getLabel());
argLabelLocs.push_back(arg.getLabelLoc());
if (auto ty = getType(argExpr))
tupleEltTypes.emplace_back(ty, arg.getLabel());
}
assert(tupleEltTypes.empty() || tupleEltTypes.size() == argExprs.size());

auto *tuple = TupleExpr::createImplicit(ctx, argExprs, argLabels);
auto *tuple =
TupleExpr::create(ctx, getLParenLoc(), argExprs, argLabels, argLabelLocs,
getRParenLoc(), /*implicit*/ true);
if (empty() || !tupleEltTypes.empty())
tuple->setType(TupleType::get(tupleEltTypes, ctx));

Expand Down
4 changes: 4 additions & 0 deletions test/ModuleInterface/default-args.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,7 @@ public func hasMagicDefaultArgs(_ f: String = #file, _ fu: String = #function, _
// CHECK: func hasSimpleDefaultArgs(_ x: Swift.Int = 0, b: Swift.Int = 1)
public func hasSimpleDefaultArgs(_ x: Int = 0, b: Int = 1) {
}

// rdar://83202870 (SR-15181): Make sure we can extract the textual representation here.
// CHECK: func hasTupleConstructionDefaultArgs(_ x: Any = (), y: (Swift.String, Swift.Int) = ("", 0))
public func hasTupleConstructionDefaultArgs(_ x: Any = Void(), y: (String, Int) = (String, Int)("", 0)) {}