Merge 9fdc801 into 35dedb5

compiler/noirc_evaluator/src/ssa/ir/instruction.rs

@@ -20,7 +20,7 @@ use super::{
     basic_block::BasicBlockId,
     dfg::{CallStack, DataFlowGraph},
     map::Id,
-    types::{NumericType, Type},
+    types::Type,
     value::{Value, ValueId},
 };
 
@@ -387,8 +387,8 @@ impl Instruction {
             | ArraySet { .. } => true,
 
             Constrain(..)
-            | Store { .. }
             | EnableSideEffectsIf { .. }
+            | Store { .. }
             | IncrementRc { .. }
             | DecrementRc { .. }
             | RangeCheck { .. } => false,

compiler/noirc_evaluator/src/ssa/ir/instruction/binary.rs

@@ -1,9 +1,9 @@
 use acvm::{acir::AcirField, FieldElement};
 use serde::{Deserialize, Serialize};
 
-use super::{
-    DataFlowGraph, Instruction, InstructionResultType, NumericType, SimplifyResult, Type, ValueId,
-};
+use crate::ssa::ir::types::NumericType;
+
+use super::{DataFlowGraph, Instruction, InstructionResultType, SimplifyResult, Type, ValueId};
 
 /// Binary Operations allowed in the IR.
 /// Aside from the comparison operators (Eq and Lt), all operators

compiler/noirc_evaluator/src/ssa/ir/instruction/cast.rs

@@ -1,7 +1,9 @@
 use acvm::{acir::AcirField, FieldElement};
 use num_bigint::BigUint;
 
-use super::{DataFlowGraph, Instruction, NumericType, SimplifyResult, Type, Value, ValueId};
+use crate::ssa::ir::types::NumericType;
+
+use super::{DataFlowGraph, Instruction, SimplifyResult, Type, Value, ValueId};
 
 /// Try to simplify this cast instruction. If the instruction can be simplified to a known value,
 /// that value is returned. Otherwise None is returned.

compiler/noirc_evaluator/src/ssa/opt/die.rs

@@ -175,6 +175,10 @@ impl Context {
         if instruction.can_eliminate_if_unused(&function.dfg) {
             let results = function.dfg.instruction_results(instruction_id);
             results.iter().all(|result| !self.used_values.contains(result))
+        } else if let Instruction::Store { address, .. } = instruction {
+            // If there's only one block in the function we can remove it as long as the address
+            // hasn't been referenced afterward.
+            (function.reachable_blocks().len() == 1) && !self.used_values.contains(address)
         } else if let Instruction::Call { func, arguments } = instruction {
             // TODO: make this more general for instructions which don't have results but have side effects "sometimes" like `Intrinsic::AsWitness`
             let as_witness_id = function.dfg.get_intrinsic(Intrinsic::AsWitness);