Skip to content

[Instructions -0.09% vs main; paired PGO estimate] Classify function qualifiers before repeated keyword checks #145

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

Draft
xmakro wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[Instructions -0.09% vs main; paired PGO estimate] Classify function qualifiers before repeated keyword checks #145

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
23 changes: 20 additions & 3 deletions compiler/rustc_parse/src/parser/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,26 @@ impl<'a> Parser<'a> {
} else {
&[exp!(Gen), exp!(Const), exp!(Async), exp!(Unsafe), exp!(Safe), exp!(Extern)]
};
self.check_keyword_case(exp!(Fn), case) // Definitely an `fn`.
// `$qual fn` or `$qual $qual`:
|| quals.iter().any(|&exp| self.check_keyword_case(exp, case))
if self.check_keyword_case(exp!(Fn), case) {
return true;
}
if case == Case::Sensitive
&& !self.token.is_non_raw_ident_where(|ident| {
matches!(
ident.name,
kw::Gen | kw::Const | kw::Async | kw::Unsafe | kw::Safe | kw::Extern
) || check_pub && ident.name == kw::Pub
})
{
// None of the qualifier checks can succeed. Preserve all their
// diagnostic expectations without inspecting the token repeatedly.
for exp in quals {
self.expected_token_types.insert(exp.token_type);
}
return false;
}
// `$qual fn` or `$qual $qual`:
quals.iter().any(|&exp| self.check_keyword_case(exp, case))
&& self.look_ahead(1, |t| {
// `$qual fn`, e.g. `const fn` or `async fn`.
t.is_keyword_case(kw::Fn, case)
Expand Down