bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix(expand): prevent infinity loop in macro containing only "///"

Browse source
This commit is contained in:
bohan 2023-06-06 23:11:08 +08:00
parent fd9bf59436
commit c927743b7b
5 changed files with 95 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_expand/src/mbe/macro_parser.rs
View file

@ -249,6 +249,7 @@ pub(super) fn compute_locs(matcher: &[TokenTree]) -> Vec<MatcherLoc> {
}
/// A single matcher position, representing the state of matching.
#[derive(Debug)]
struct MatcherPos {
/// The index into `TtParser::locs`, which represents the "dot".
idx: usize,

1
compiler/rustc_expand/src/mbe/macro_rules.rs
View file

@ -647,6 +647,7 @@ fn check_lhs_no_empty_seq(sess: &ParseSess, tts: &[mbe::TokenTree]) -> bool {
if seq.separator.is_none()
&& seq.tts.iter().all(|seq_tt| match seq_tt {
TokenTree::MetaVarDecl(_, _, Some(NonterminalKind::Vis)) => true,
TokenTree::Token(t) => matches!(t, Token { kind: DocComment(..), .. }),
TokenTree::Sequence(_, sub_seq) => {
sub_seq.kleene.op == mbe::KleeneOp::ZeroOrMore
|| sub_seq.kleene.op == mbe::KleeneOp::ZeroOrOne