Merge branch 'main' into niklasmischkulnig/pack-411-fs-and-vm-async-c…

…hunk
vercel · Jul 16, 2024 · 4a91251 · 4a91251
2 parents 05e0d79 + 99119e2
commit 4a91251
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/turbo-tasks-memory/src/task.rs b/crates/turbo-tasks-memory/src/task.rs
@@ -1621,22 +1621,22 @@ impl Task {
                 }
                 state.gc.generation = None;
 
-                if active {
-                    let mut cells_to_drop = Vec::new();
-
-                    match &mut state.state_type {
-                        TaskStateType::Done { stateful, edges: _ } => {
-                            if *stateful {
-                                return GcResult::NotPossible;
-                            }
-                        }
-                        TaskStateType::Dirty { .. } => {}
-                        _ => {
-                            // GC can't run in this state. We will reschedule it when the execution
-                            // completes.
+                match &mut state.state_type {
+                    TaskStateType::Done { stateful, edges: _ } => {
+                        if *stateful {
                             return GcResult::NotPossible;
                         }
                     }
+                    TaskStateType::Dirty { .. } => {}
+                    _ => {
+                        // GC can't run in this state. We will reschedule it when the execution
+                        // completes.
+                        return GcResult::NotPossible;
+                    }
+                }
+
+                if active {
+                    let mut cells_to_drop = Vec::new();
 
                     // shrinking memory and dropping cells
                     state.aggregation_node.shrink_to_fit();