Temporary fix. Cut out incremental build

pc2 · May 7, 2024 · ed028e5 · ed028e5
1 parent 6fa826a
commit ed028e5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/arena_alloc.rs b/src/arena_alloc.rs
@@ -119,6 +119,10 @@ impl<T, IndexMarker : UUIDMarker> ArenaAllocator<T, IndexMarker> {
         self.free_slots.push(uuid);
         std::mem::replace(&mut self.data[uuid], None).unwrap()
     }
+    pub fn clear(&mut self) {
+        self.data.clear();
+        self.free_slots.clear();
+    }
     pub fn iter<'a>(&'a self) -> ArenaIterator<'a, T, IndexMarker> {
         self.into_iter()
     }
@@ -411,6 +415,9 @@ impl<T, IndexMarker : UUIDMarker> FlatAlloc<T, IndexMarker> {
     pub fn is_empty(&self) -> bool {
         self.data.is_empty()
     }
+    pub fn clear(&mut self) {
+        self.data.clear();
+    }
     pub fn iter<'a>(&'a self) -> FlatAllocIter<'a, T, IndexMarker> {
         self.into_iter()
     }

diff --git a/src/compiler_top.rs b/src/compiler_top.rs
@@ -40,8 +40,21 @@ pub fn update_file(text : String, file_id : FileUUID, linker : &mut Linker) {
     file_data.file_text = FileText::new(text);
     file_data.tree = tree;
 
-    let mut builder = linker.get_file_builder(file_id);
-    gather_initial_file_data(&mut builder);
+    // TEMPORARY Fix crash for incremental builds
+    //let mut builder = linker.get_file_builder(file_id);
+    //gather_initial_file_data(&mut builder);
+
+    linker.modules.clear();
+    let mut ids = Vec::new();
+    for (id, f) in &mut linker.files {
+        f.associated_values.clear();
+        ids.push(id);
+    }
+
+    for id in ids {
+        let mut builder = linker.get_file_builder(id);
+        gather_initial_file_data(&mut builder);
+    }
 }
 
 pub fn recompile_all(linker : &mut Linker) {