feat: add (x | 1) optimization for booleans

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

@@ -39,9 +39,9 @@
     Or,
     /// Bitwise xor (^)
     Xor,
     /// Bitshift left (<<)
     Shl,
     /// Bitshift right (>>)
     Shr,
 }
 
@@ -256,6 +256,10 @@
                 if rhs_is_zero {
                     return SimplifyResult::SimplifiedTo(self.lhs);
                 }
+                if operand_type == NumericType::bool() && (lhs_is_one || rhs_is_one) {
+                    let one = dfg.make_constant(FieldElement::one(), operand_type);
+                    return SimplifyResult::SimplifiedTo(one);
+                }
                 if dfg.resolve(self.lhs) == dfg.resolve(self.rhs) {
                     return SimplifyResult::SimplifiedTo(self.lhs);
                 }

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

@@ -480,20 +480,14 @@ fn simplify_slice_push_back(
 }
 
 fn simplify_slice_pop_back(
-    element_type: Type,
+    slice_type: Type,
     arguments: &[ValueId],
     dfg: &mut DataFlowGraph,
     block: BasicBlockId,
     call_stack: CallStack,
 ) -> SimplifyResult {
-    let element_types = match element_type.clone() {
-        Type::Slice(element_types) | Type::Array(element_types, _) => element_types,
-        _ => {
-            unreachable!("ICE: Expected slice or array, but got {element_type}");
-        }
-    };
-
-    let element_count = element_type.element_size();
+    let element_types = slice_type.element_types();
+    let element_count = element_types.len();
     let mut results = VecDeque::with_capacity(element_count + 1);
 
     let new_slice_length = update_slice_length(arguments[0], dfg, BinaryOp::Sub, block);
@@ -507,14 +501,17 @@ fn simplify_slice_pop_back(
     flattened_len = update_slice_length(flattened_len, dfg, BinaryOp::Sub, block);
 
     // We must pop multiple elements in the case of a slice of tuples
-    for _ in 0..element_count {
+    // Iterating through element types in reverse here since we're popping from the end
+    for element_type in element_types.iter().rev() {
         let get_last_elem_instr =
             Instruction::ArrayGet { array: arguments[1], index: flattened_len };
+
+        let element_type = Some(vec![element_type.clone()]);
         let get_last_elem = dfg
             .insert_instruction_and_results(
                 get_last_elem_instr,
                 block,
-                Some(element_types.to_vec()),
+                element_type,
                 call_stack.clone(),
             )
             .first();

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

@@ -173,7 +173,8 @@ pub(super) fn simplify_msm(
                 var_scalars.push(zero);
                 let result_x = dfg.make_constant(result_x, NumericType::NativeField);
                 let result_y = dfg.make_constant(result_y, NumericType::NativeField);
-                let result_is_infinity = dfg.make_constant(result_is_infinity, NumericType::bool());
+                let result_is_infinity =
+                    dfg.make_constant(result_is_infinity, NumericType::NativeField);
                 var_points.push(result_x);
                 var_points.push(result_y);
                 var_points.push(result_is_infinity);
@@ -387,9 +388,9 @@ mod test {
                 v5 = make_array [Field 1, Field 0, v0, Field 0, Field 2, Field 0] : [Field; 6]
                 v7 = make_array [Field 1, Field 17631683881184975370165255887551781615748388533673675138860, Field 0, v0, v1, Field 0, Field 1, Field 17631683881184975370165255887551781615748388533673675138860, Field 0] : [Field; 9]
                 v8 = make_array [v0, Field 0, Field 1, Field 0] : [Field; 4]
-                v12 = make_array [v0, v1, Field 0, Field -3227352362257037263902424173275354266044964400219754872043023745437788450996, Field 8902249110305491597038405103722863701255802573786510474664632793109847672620, u1 0] : [Field; 6]
-                v14 = call multi_scalar_mul(v12, v8) -> [Field; 3]
-                return v14
+                v11 = make_array [v0, v1, Field 0, Field -3227352362257037263902424173275354266044964400219754872043023745437788450996, Field 8902249110305491597038405103722863701255802573786510474664632793109847672620, Field 0] : [Field; 6]
+                v13 = call multi_scalar_mul(v12, v8) -> [Field; 3]
+                return v13
             }
             "#;
         assert_normalized_ssa_equals(ssa, expected_src);