Skip to content

[libSyntax] Fix places in which RawSyntax nodes were created without an arena #18878

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
Aug 22, 2018
Merged

[libSyntax] Fix places in which RawSyntax nodes were created without an arena #18878

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: 10 additions & 7 deletions lib/Parse/ParseExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,8 @@ Parser::parseExprPostfixSuffix(ParserResult<Expr> Result, bool isExprBasic,
if (SyntaxContext->isEnabled()) {
// Add dummy blank argument list to the call expression syntax.
SyntaxContext->addSyntax(
SyntaxFactory::makeBlankFunctionCallArgumentList());
SyntaxFactory::makeBlankFunctionCallArgumentList(
&SyntaxContext->getArena()));
}

ParserResult<Expr> closure =
Expand Down Expand Up @@ -1547,10 +1548,10 @@ ParserResult<Expr> Parser::parseExprPrimary(Diag<> ID, bool isExprBasic) {
: VarDecl::Specifier::Var;
auto pattern = createBindingFromPattern(loc, name, specifier);
if (SyntaxContext->isEnabled()) {
PatternSyntax PatternNode =
SyntaxFactory::makeIdentifierPattern(SyntaxContext->popToken());
ExprSyntax ExprNode =
SyntaxFactory::makeUnresolvedPatternExpr(PatternNode);
PatternSyntax PatternNode = SyntaxFactory::makeIdentifierPattern(
SyntaxContext->popToken(), &SyntaxContext->getArena());
ExprSyntax ExprNode = SyntaxFactory::makeUnresolvedPatternExpr(
PatternNode, &SyntaxContext->getArena());
SyntaxContext->addSyntax(ExprNode);
}
return makeParserResult(new (Context) UnresolvedPatternExpr(pattern));
Expand Down Expand Up @@ -1658,7 +1659,8 @@ ParserResult<Expr> Parser::parseExprPrimary(Diag<> ID, bool isExprBasic) {
if (SyntaxContext->isEnabled()) {
// Add dummy blank argument list to the call expression syntax.
SyntaxContext->addSyntax(
SyntaxFactory::makeBlankFunctionCallArgumentList());
SyntaxFactory::makeBlankFunctionCallArgumentList(
&SyntaxContext->getArena()));
}

ParserResult<Expr> closure =
Expand Down Expand Up @@ -2028,7 +2030,8 @@ DeclName Parser::parseUnqualifiedDeclName(bool afterDot,
SyntaxParsingContext ArgsCtxt(SyntaxContext, SyntaxKind::DeclNameArguments);
consumeToken(tok::l_paren);
if (SyntaxContext->isEnabled())
SyntaxContext->addSyntax(SyntaxFactory::makeBlankDeclNameArgumentList());
SyntaxContext->addSyntax(SyntaxFactory::makeBlankDeclNameArgumentList(
&SyntaxContext->getArena()));
consumeToken(tok::r_paren);
loc = DeclNameLoc(baseNameLoc);
SmallVector<Identifier, 2> argumentLabels;
Expand Down
7 changes: 4 additions & 3 deletions lib/Parse/ParseType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,8 +438,8 @@ ParserResult<TypeRepr> Parser::parseType(Diag<> MessageID,
.useArguments(TupleTypeNode->getElements())
.useRightParen(TupleTypeNode->getRightParen());
} else {
Builder
.addTupleTypeElement(SyntaxFactory::makeTupleTypeElement(InputNode));
Builder.addTupleTypeElement(SyntaxFactory::makeTupleTypeElement(
InputNode, /*TrailingComma=*/None, &Context.getSyntaxArena()));
}
SyntaxContext->addSyntax(Builder.build());
}
Expand Down Expand Up @@ -719,7 +719,8 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID,

if (SyntaxContext->isEnabled() && Status.isSuccess()) {
auto LastNode = SyntaxFactory::makeCompositionTypeElement(
SyntaxContext->popIf<TypeSyntax>().getValue(), None);
SyntaxContext->popIf<TypeSyntax>().getValue(), None,
&SyntaxContext->getArena());
SyntaxContext->addSyntax(LastNode);
}
SyntaxContext->collectNodesInPlace(SyntaxKind::CompositionTypeElementList);
Expand Down