Skip to content

Cherry-pick standard library parsing fix for debug builds. #27370

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 25, 2019
Merged

Cherry-pick standard library parsing fix for debug builds. #27370

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
2 changes: 1 addition & 1 deletion include/swift/Parse/SyntaxParsingContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ class alignas(1 << SyntaxAlignInBits) SyntaxParsingContext {
return SyntaxNode(std::move(rawNode));
}

ParsedTokenSyntax &&popToken();
ParsedTokenSyntax popToken();

/// Create a node using the tail of the collected parts. The number of parts
/// is automatically determined from \c Kind. Node: limited number of \c Kind
Expand Down
5 changes: 3 additions & 2 deletions lib/Parse/SyntaxParsingContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,9 @@ const SyntaxParsingContext *SyntaxParsingContext::getRoot() const {
return Curr;
}

ParsedTokenSyntax &&SyntaxParsingContext::popToken() {
return std::move(popIf<ParsedTokenSyntax>().getValue());
ParsedTokenSyntax SyntaxParsingContext::popToken() {
auto tok = popIf<ParsedTokenSyntax>();
return std::move(tok.getValue());
}

/// Add Token with Trivia to the parts.
Expand Down