Merge branch 'master' into sync-noir

* master:
  chore: pull SSA parser from sync PR (#9928)

noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/procedures/mod.rs

@@ -17,6 +17,7 @@ use mem_copy::compile_mem_copy_procedure;
 use noirc_errors::debug_info::ProcedureDebugId;
 use prepare_vector_insert::compile_prepare_vector_insert_procedure;
 use prepare_vector_push::compile_prepare_vector_push_procedure;
+use revert_with_string::compile_revert_with_string_procedure;
 use serde::{Deserialize, Serialize};
 use vector_copy::compile_vector_copy_procedure;
 use vector_pop_back::compile_vector_pop_back_procedure;
@@ -34,7 +35,7 @@ use super::{
 /// Procedures are a set of complex operations that are common in the noir language.
 /// Extracting them to reusable procedures allows us to reduce the size of the generated Brillig.
 /// Procedures receive their arguments on scratch space to avoid stack dumping&restoring.
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, Deserialize, Serialize)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash, PartialOrd, Ord, Deserialize, Serialize)]
 pub enum ProcedureId {
     ArrayCopy,
     ArrayReverse,

noir/noir-repo/compiler/noirc_evaluator/src/lib.rs

@@ -13,6 +13,8 @@ pub mod brillig;
 
 pub use ssa::create_program;
 
+pub use ssa::ir::instruction::ErrorType;
+
 /// Trims leading whitespace from each line of the input string, according to
 /// how much leading whitespace there is on the first non-empty line.
 #[cfg(test)]

noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs

@@ -1010,13 +1010,13 @@ impl<'a> Context<'a> {
             };
             entry_point.link_with(artifact);
             // Insert the range of opcode locations occupied by a procedure
-            if let Some(procedure_id) = artifact.procedure {
+            if let Some(procedure_id) = &artifact.procedure {
                 let num_opcodes = entry_point.byte_code.len();
                 let previous_num_opcodes = entry_point.byte_code.len() - artifact.byte_code.len();
                 // We subtract one as to keep the range inclusive on both ends
                 entry_point
                     .procedure_locations
-                    .insert(procedure_id, (previous_num_opcodes, num_opcodes - 1));
+                    .insert(procedure_id.clone(), (previous_num_opcodes, num_opcodes - 1));
             }
         }
         // Generate the final bytecode