Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 22:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18255 - ChayimFriedman2:stack-overflow, r=HKalbasi

Browse source 
Use external stack in borrowck DFS

Because damnit, it can crash r-a. Why do people make this stupid DFSes anyway (I get it, it's easier until it blows).

Fixes #18223 (who thought DFS will be the problem).
This commit is contained in:
bors 2024-10-06 21:23:00 +00:00
commit 2b750da1a1
1 changed files with 67 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/hir-ty/src/mir/borrowck.rs
View file

@ -386,10 +386,11 @@ fn ever_initialized_map(
fn dfs( fn dfs(
db: &dyn HirDatabase, db: &dyn HirDatabase,
body: &MirBody, body: &MirBody,
b: BasicBlockId,
l: LocalId, l: LocalId,
stack: &mut Vec<BasicBlockId>,
result: &mut ArenaMap<BasicBlockId, ArenaMap<LocalId, bool>>, result: &mut ArenaMap<BasicBlockId, ArenaMap<LocalId, bool>>,
) { ) {
while let Some(b) = stack.pop() {
let mut is_ever_initialized = result[b][l]; // It must be filled, as we use it as mark for dfs let mut is_ever_initialized = result[b][l]; // It must be filled, as we use it as mark for dfs
let block = &body.basic_blocks[b]; let block = &body.basic_blocks[b];
for statement in &block.statements { for statement in &block.statements {
@ -420,7 +421,7 @@ fn ever_initialized_map(
let mut process = |target, is_ever_initialized| { let mut process = |target, is_ever_initialized| {
if !result[target].contains_idx(l) || !result[target][l] && is_ever_initialized { if !result[target].contains_idx(l) || !result[target][l] && is_ever_initialized {
result[target].insert(l, is_ever_initialized); result[target].insert(l, is_ever_initialized);
dfs(db, body, target, l, result); stack.push(target);
} }
}; };
match &terminator.kind { match &terminator.kind {
@ -441,7 +442,9 @@ fn ever_initialized_map(
target.iter().chain(cleanup).for_each(|&it| process(it, is_ever_initialized)); target.iter().chain(cleanup).for_each(|&it| process(it, is_ever_initialized));
} }
TerminatorKind::Drop { target, unwind, place: _ } => { TerminatorKind::Drop { target, unwind, place: _ } => {
iter::once(target).chain(unwind).for_each(|&it| process(it, is_ever_initialized)); iter::once(target)
.chain(unwind)
.for_each(|&it| process(it, is_ever_initialized));
} }
TerminatorKind::DropAndReplace { .. } TerminatorKind::DropAndReplace { .. }
| TerminatorKind::Assert { .. } | TerminatorKind::Assert { .. }
@ -453,15 +456,21 @@ fn ever_initialized_map(
} }
} }
} }
}
let mut stack = Vec::new();
for &l in &body.param_locals { for &l in &body.param_locals {
result[body.start_block].insert(l, true); result[body.start_block].insert(l, true);
dfs(db, body, body.start_block, l, &mut result); stack.clear();
stack.push(body.start_block);
dfs(db, body, l, &mut stack, &mut result);
} }
for l in body.locals.iter().map(|it| it.0) { for l in body.locals.iter().map(|it| it.0) {
db.unwind_if_cancelled(); db.unwind_if_cancelled();
if !result[body.start_block].contains_idx(l) { if !result[body.start_block].contains_idx(l) {
result[body.start_block].insert(l, false); result[body.start_block].insert(l, false);
dfs(db, body, body.start_block, l, &mut result); stack.clear();
stack.push(body.start_block);
dfs(db, body, l, &mut stack, &mut result);
} }
} }
result result