Avoid unbounded O(n^2) when parsing nested type args #117143

estebank · 2023-10-24T22:23:23Z

When encountering code like f::<f::<f::<f::<f::<f::<f::<f::<... with unmatched closing angle brackets, add a linear check that avoids the exponential behavior of the parse recovery mechanism.

Fix #117080, fix #115414.

rustbot · 2023-10-24T22:23:32Z

r? @b-naber

(rustbot has picked a reviewer for you, use r? to override)

estebank · 2023-10-24T22:25:40Z

@bors try

bors · 2023-10-24T22:26:49Z

⌛ Trying commit 54dffa1 with merge bbebabf...

Avoid unbounded O(n^2) when parsing nested type args When encountering code like `f::<f::<f::<f::<f::<f::<f::<f::<...` with unmatched closing angle brackets, add a linear check that avoids the exponential behavior of the parse recovery mechanism. Fix rust-lang#117080.

matthiaskrgr · 2023-10-24T22:33:52Z

Might also fix #115414 perhaps? ^^

estebank · 2023-10-24T22:34:58Z

@matthiaskrgr it does! 😀

compiler/rustc_parse/src/parser/path.rs

When encountering code like `f::<f::<f::<f::<f::<f::<f::<f::<...` with unmatched closing angle brackets, add a linear check that avoids the exponential behavior of the parse recovery mechanism. Fix rust-lang#117080.

wesleywiser · 2023-10-26T14:24:32Z

@bors r rollup

bors · 2023-10-26T14:24:34Z

📌 Commit 2dec1bc has been approved by wesleywiser

It is now in the queue for this repository.

apiraino · 2023-10-26T14:34:46Z

Beta backport declined as per compiler team on Zulip.

This is a stable-to-stable regression for code (admittely strange) that does not compile anyway, so we are inclined to let this patch ride the trains.

@rustbot label -beta-nominated

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#116905 (refactor(compiler/resolve): simplify some code) - rust-lang#117095 (Add way to differentiate argument locals from other locals in Stable MIR) - rust-lang#117143 (Avoid unbounded O(n^2) when parsing nested type args) - rust-lang#117194 (Minor improvements to `rustc_incremental`) - rust-lang#117202 (Revert "Remove TaKO8Ki from reviewers") - rust-lang#117207 (The value of `-Cinstrument-coverage=` doesn't need to be `Option`) - rust-lang#117214 (Quietly fail if an error has already occurred) - rust-lang#117221 (Rename type flag `HAS_TY_GENERATOR` to `HAS_TY_COROUTINE`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#117143 - estebank:issue-117080, r=wesleywiser Avoid unbounded O(n^2) when parsing nested type args When encountering code like `f::<f::<f::<f::<f::<f::<f::<f::<...` with unmatched closing angle brackets, add a linear check that avoids the exponential behavior of the parse recovery mechanism. Fix rust-lang#117080, fix rust-lang#115414.

mv tests

855444e

rustbot assigned b-naber Oct 24, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 24, 2023

This comment has been minimized.

Sign in to view

estebank force-pushed the issue-117080 branch from 54dffa1 to 7bce646 Compare October 24, 2023 22:33

estebank added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 24, 2023

mcol reviewed Oct 25, 2023

View reviewed changes

compiler/rustc_parse/src/parser/path.rs Outdated Show resolved Hide resolved

Avoid unbounded O(n^2) when parsing nested type args

2dec1bc

When encountering code like `f::<f::<f::<f::<f::<f::<f::<f::<...` with unmatched closing angle brackets, add a linear check that avoids the exponential behavior of the parse recovery mechanism. Fix rust-lang#117080.

estebank force-pushed the issue-117080 branch from 7bce646 to 2dec1bc Compare October 25, 2023 19:07

wesleywiser approved these changes Oct 26, 2023

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 26, 2023

rustbot removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 26, 2023

matthiaskrgr mentioned this pull request Oct 26, 2023

Rollup of 8 pull requests #117228

Merged

bors merged commit 7eb0548 into rust-lang:master Oct 26, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 26, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

estebank deleted the issue-117080 branch November 9, 2023 05:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Avoid unbounded O(n^2) when parsing nested type args #117143

Avoid unbounded O(n^2) when parsing nested type args #117143

estebank commented Oct 24, 2023 •

edited

Loading

rustbot commented Oct 24, 2023

estebank commented Oct 24, 2023

bors commented Oct 24, 2023

This comment has been minimized.

matthiaskrgr commented Oct 24, 2023

estebank commented Oct 24, 2023

wesleywiser commented Oct 26, 2023

bors commented Oct 26, 2023

apiraino commented Oct 26, 2023

Avoid unbounded O(n^2) when parsing nested type args #117143

Avoid unbounded O(n^2) when parsing nested type args #117143

Conversation

estebank commented Oct 24, 2023 • edited Loading

rustbot commented Oct 24, 2023

estebank commented Oct 24, 2023

bors commented Oct 24, 2023

This comment has been minimized.

matthiaskrgr commented Oct 24, 2023

estebank commented Oct 24, 2023

wesleywiser commented Oct 26, 2023

bors commented Oct 26, 2023

apiraino commented Oct 26, 2023

estebank commented Oct 24, 2023 •

edited

Loading