Fix build

julian-hartl · Jul 8, 2024 · 044e359 · 044e359
1 parent 9353463
commit 044e359
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/ir/crates/back/src/codegen/register_allocator/mod.rs b/ir/crates/back/src/codegen/register_allocator/mod.rs
@@ -802,7 +802,7 @@ impl<TM: TargetMachine> Function<TM> {
                 if let Some(reg) = out.and_then(|reg| reg.try_as_virtual()) {
                     live_sets.remove(bb_id, reg);
                     local_live_ranges[reg]
-                        .get_or_insert_default()
+                        .get_or_insert_with(Default::default)
                         .set_start(ProgPoint::Write(instr_nr));
                 }
                 let read = instr.reads();
@@ -812,7 +812,7 @@ impl<TM: TargetMachine> Function<TM> {
                     };
                     live_sets.insert(bb_id, reg);
                     local_live_ranges[reg]
-                        .get_or_insert_default()
+                        .get_or_insert_with(Default::default)
                         .maybe_set_end(ProgPoint::Read(instr_nr));
                 }
                 if let Some(val) = instr_nr.checked_sub(1) {
@@ -823,7 +823,7 @@ impl<TM: TargetMachine> Function<TM> {
                 if let Some(def) = def.try_as_virtual() {
                     live_sets.remove(bb_id, def);
                     local_live_ranges[def]
-                        .get_or_insert_default()
+                        .get_or_insert_with(Default::default)
                         .set_start(entry_pp);
                 }
             }

diff --git a/ir/crates/back/src/lib.rs b/ir/crates/back/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(option_get_or_insert_default)]
 #![deny(clippy::enum_glob_use)]
 #![warn(clippy::pedantic)]
 #![forbid(unsafe_code)]

diff --git a/lang/src/codegen/c/program.rs b/lang/src/codegen/c/program.rs
@@ -42,12 +42,15 @@ impl CProgram {
         let mut file = File::create(Self::C_INPUT_FILE)?;
         let transpiled_code = self.source_code();
         file.write_all(transpiled_code.as_bytes())?;
-        Command::new(Self::C_COMPILER)
+        if !Command::new(Self::C_COMPILER)
             .arg(Self::C_INPUT_FILE)
             .arg("-o")
             .arg(Self::OUTPUT_FILE)
             .status()?
-            .exit_ok()?;
+            .success()
+        {
+            return Err(anyhow!("Failed to compile C program"));
+        }
         Ok(file)
     }
 

diff --git a/lang/src/main.rs b/lang/src/main.rs
@@ -1,5 +1,3 @@
-#![feature(exit_status_error)]
-
 use std::{fs::File, io::Write};
 
 use anyhow::{anyhow, Result};