[FIX] now all tests pass

src/IR/module.rs

@@ -15,6 +15,8 @@ pub struct Module {
 
     /// The number of current constants
     pub(crate) const_index: usize,
+
+    pub(crate) debug_passes: bool,
 }
 
 impl Module {
@@ -25,6 +27,7 @@ impl Module {
             consts: HashMap::new(),
             dbg_registry: None,
             const_index: 0,
+            debug_passes: false,
         }
     }
 
@@ -33,6 +36,11 @@ impl Module {
         self.dbg_registry = Some(DebugRegistry::new(producer, lang, infile));
     }
 
+    /// Makes, that debugging information is outputed from the passes
+    pub fn activate_pass_dbg(&mut self) {
+        self.debug_passes = true;
+    }
+
     /// Adds a new function to the module
     pub fn add(&mut self, name: &str, ty: &FunctionType) -> &mut Function {
         self.funcs
@@ -155,11 +163,17 @@ impl Module {
 
     /// Runs the pass manager over all functions
     pub fn runPassMngr(&mut self, mngr: PassManager) {
-        for (_, func) in &mut self.funcs {
-            func.runPassMngr(&mngr);
-
-            for opt in &mngr.passes {
-                opt.run_func(func);
+        for pass in &mngr.passes {
+            if self.debug_passes {
+                eprintln!("Running pass: {}", pass.name());
+            }
+
+            for (_, func) in &mut self.funcs {
+                pass.run_func(func);
+
+                for block in &mut func.blocks {
+                    pass.run(block);
+                }
             }
         }
     }

src/IR/nodes/cast.rs

@@ -62,8 +62,10 @@ impl Ir for Cast<Var, TypeMetadata, Var> {
 }
 
 impl EvalOptVisitor for Cast<Var, TypeMetadata, Var> {
-    fn maybe_inline(&self, _: &HashMap<String, Type>) -> Option<Box<dyn Ir>> {
-        None
+    fn maybe_inline(&self, vars: &HashMap<String, Type>) -> Option<Box<dyn Ir>> {
+        if let Some(var) = vars.get(&self.inner1.name) {
+            Some(Assign::new(self.inner3.to_owned(), *var))
+        } else { return None; }
     }
 
     fn eval(&self) -> Option<Box<dyn Ir>> {

src/Optimizations/Passes/ConstantEvaluation.rs

@@ -12,6 +12,10 @@ pub fn ConstantEvaluation() -> Box<dyn Pass> {
 }
 
 impl Pass for ConstantEvaluation {
+    fn name(&self) -> &'static str {
+        "ConstantEvaluation"
+    }
+
     fn run(&self, block: &mut crate::prelude::Block) {
         let mut const_values = HashMap::new();
 

src/Optimizations/Passes/DeadBlockElimination.rs

@@ -12,6 +12,10 @@ pub fn DeadBlockElimination() -> Box<dyn Pass> {
 }
 
 impl Pass for DeadBlockElimination {
+    fn name(&self) -> &'static str {
+        "DeadBlockElimination"
+    }
+
     fn run_func(&self, func: &mut crate::prelude::Function) {
         let mut used_blocks = Vec::new();
 

src/Optimizations/Passes/DeadNodeElimination.rs

@@ -10,6 +10,10 @@ pub fn DeadNodeElimination() -> Box<dyn Pass> {
 }
 
 impl Pass for DeadNodeElimination_ {
+    fn name(&self) -> &'static str {
+        "DeadNodeElimination"
+    }
+
     fn run_func(&self, func: &mut crate::prelude::Function) {
         for _ in 0..2 { // iterate two times, cuz then we can remove dependants with a dept of 1
             let mut used: Vec<String> = Vec::new();

src/Optimizations/Passes/InstrCombine.rs

@@ -10,6 +10,10 @@ pub fn InstrCombine() -> Box<dyn Pass> {
 }
 
 impl Pass for InstrCombinePass {
+    fn name(&self) -> &'static str {
+        "InstrCombine"
+    }
+
     fn run_func(&self, func: &mut crate::prelude::Function) {
         InstrCombinePass::opt_func(func);
 
@@ -49,12 +53,12 @@ impl InstrCombinePass {
     }
 
     /// Optimizes the block by combining instructions
-    pub(crate) fn opt_block(block: &mut Block) {
+    pub(crate) fn opt_block(_block: &mut Block) {
         // TODO
     }
 
     /// Optimizes the function by combining instructions
-    pub(crate) fn opt_func(func: &mut Function) {
+    pub(crate) fn opt_func(_func: &mut Function) {
         // TODO
     }
 }

src/Optimizations/template.rs

@@ -7,4 +7,7 @@ pub trait Pass {
 
     /// Runs the pass on the entire function
     fn run_func(&self, _func: &mut Function) {}
+
+    /// Returns the name of the pass
+    fn name(&self) -> &'static str;
 }

tests/Optimizations/const_eval/cast0.yl

@@ -13,6 +13,6 @@ define i32 @main() {
 define i32 @main() {
   entry:
     %0 = i32 5
-    %1 = i32 %0
-    ret i32 %1
+    %1 = i32 5
+    ret i32 5
 }

tests/Optimizations/instcombine/select_into_cast.yl

@@ -11,7 +11,7 @@ define i32 @main() {
 
 # STDOUT:
 
-define void @main() {
+define i32 @main() {
   entry:
     %1 = i8 1
     %2 = cast i8 %1 to i32