Skip to content

fix: correct remove_available_modules #10594

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
JSerFeng merged 1 commit into from
Jun 6, 2025
Merged

fix: correct remove_available_modules #10594

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
16 changes: 8 additions & 8 deletions crates/rspack_core/src/build_chunk_graph/available_modules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,17 @@ pub fn remove_available_modules(
chunk_parents: &mut [Vec<usize>],
chunk_children: &mut [Vec<usize>],
) {
let mut chunk_incomings: Vec<usize> = chunk_parents.iter().map(|parents| parents.len()).collect();
let mut chunk_incomings: Vec<HashSet<usize>> = chunk_parents
.iter()
.map(|parents| parents.iter().copied().collect())
.collect();
let mut pending = HashSet::<usize>::default();
let module_graph = compilation.get_module_graph();

let mut stack = roots
.iter()
.filter(|root| {
let is_entry_without_depend_on = chunk_incomings[**root] == 0 && matches!(&chunks[**root].1.chunk_desc, ChunkDesc::Entry(box EntryChunkDesc{initial, ..}) if *initial);
let is_entry_without_depend_on = chunk_incomings[**root].is_empty() && matches!(&chunks[**root].1.chunk_desc, ChunkDesc::Entry(box EntryChunkDesc{initial, ..}) if *initial);
if is_entry_without_depend_on {
pending.insert(**root);
}
Expand All @@ -111,10 +114,6 @@ pub fn remove_available_modules(
while let Some((parent_available_modules, chunk_index, force_continue)) = stack.pop() {
let (_, chunk) = &mut chunks[chunk_index];

if chunk_incomings[chunk_index] >= 1 {
chunk_incomings[chunk_index] -= 1;
}

let curr_parents_modules = if let Some(curr) = &mut available_modules[chunk_index] {
// if already calculated
let res = if force_continue {
Expand All @@ -138,21 +137,22 @@ pub fn remove_available_modules(
};

// we have incomings that are not calculated, wait till we calculated
if chunk_incomings[chunk_index] != 0 {
if !chunk_incomings[chunk_index].is_empty() && !force_continue {
pending.insert(chunk_index);
continue;
}

// if we reach here, means all incomings have calculated (if no cycle)
//, we can continue calculate children
pending.remove(&chunk_index);

let curr_chunk_modules = chunk.chunk_desc.chunk_modules_ordinal();
let child_available = curr_parents_modules.union(curr_chunk_modules);

for child in &chunk_children[chunk_index] {
let child_chunk = &mut chunks[*child].1.chunk_desc;

chunk_incomings[*child].remove(&chunk_index);

if matches!(
&child_chunk,
ChunkDesc::Entry(box EntryChunkDesc { initial, .. }) if !initial
Expand Down
Loading