fix: simplify constant assert messages into ConstrainError::Static

compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs

@@ -458,7 +458,7 @@
         let typ = Self::convert_non_tuple_type(&cast.r#type);
 
         Ok(self.insert_safe_cast(lhs, typ, cast.location).into())
     }
 
     /// Codegens a for loop, creating three new blocks in the process.
     /// The return value of a for loop is always a unit literal.
@@ -512,7 +512,7 @@
         self.define(for_expr.index_variable, loop_index.into());
         self.codegen_expression(&for_expr.block)?;
         let new_loop_index = self.make_offset(loop_index, 1);
         self.builder.terminate_with_jmp(loop_entry, vec![new_loop_index]);
 
         // Finish by switching back to the end of the loop
         self.builder.switch_to_block(loop_end);
@@ -525,7 +525,7 @@
     ///
     ///   v0 = ... codegen cond ...
     ///   brif v0, then: then_block, else: else_block
     /// then_block():
     ///   v1 = ... codegen a ...
     ///   br end_if(v1)
     /// else_block():
@@ -700,6 +700,12 @@
             return Ok(None)
         };
 
+        if let ast::Expression::Literal(ast::Literal::Str(assert_message)) =
+            assert_message_expr.as_ref()
+        {
+            return Ok(Some(Box::new(ConstrainError::Static(assert_message.to_string()))));
+        }
+
         let ast::Expression::Call(call) = assert_message_expr.as_ref() else {
             return Err(InternalError::Unexpected {
                 expected: "Expected a call expression".to_owned(),

compiler/noirc_frontend/src/hir/resolution/resolver.rs

@@ -1211,12 +1211,11 @@ impl<'a> Resolver<'a> {
         span: Span,
         condition: Expression,
     ) -> Option<ExprId> {
-        let mut assert_msg_call_args = if let Some(assert_message_expr) = assert_message_expr {
-            vec![assert_message_expr.clone()]
-        } else {
-            return None;
-        };
-        assert_msg_call_args.push(condition);
+        let assert_message_expr = assert_message_expr?;
+
+        if matches!(assert_message_expr,  Expression {kind: ExpressionKind::Literal(Literal::Str(..)), ..}){
+            return Some(self.resolve_expression(assert_message_expr));
+        }
 
         let is_in_stdlib = self.path_resolver.module_id().krate.is_stdlib();
         let assert_msg_call_path = if is_in_stdlib {
@@ -1232,6 +1231,7 @@ impl<'a> Resolver<'a> {
                 span,
             })
         };
+        let assert_msg_call_args = vec![assert_message_expr.clone(), condition];
         let assert_msg_call_expr = Expression::call(
             Expression { kind: assert_msg_call_path, span },
             assert_msg_call_args,

tooling/debugger/src/context.rs

@@ -530,7 +530,7 @@ mod tests {
         let initial_witness = BTreeMap::from([(Witness(1), fe_1)]).into();
 
         let foreign_call_executor =
-            Box::new(DefaultDebugForeignCallExecutor::from_artifact(true, &debug_artifact));
+            Box::new(DefaultDebugForeignCallExecutor::from_artifact(true, debug_artifact));
         let mut context = DebugContext::new(
             &StubbedBlackBoxSolver,
             circuit,
@@ -624,7 +624,7 @@ mod tests {
         let initial_witness = BTreeMap::from([(Witness(1), fe_1), (Witness(2), fe_1)]).into();
 
         let foreign_call_executor =
-            Box::new(DefaultDebugForeignCallExecutor::from_artifact(true, &debug_artifact));
+            Box::new(DefaultDebugForeignCallExecutor::from_artifact(true, debug_artifact));
         let mut context = DebugContext::new(
             &StubbedBlackBoxSolver,
             circuit,