Save circuit output in struct representation, instead of integer

It is ultimately returned in struct representation, so now it is
converted sooner (useful for guarantee representation)

src/libfuncs/circuit.rs

@@ -7,7 +7,7 @@ use crate::{
     error::{Result, SierraAssertError},
     libfuncs::r#struct::build_struct_value,
     metadata::MetadataStorage,
-    types::TypeBuilder,
+    types::{circuit::build_u384_struct_type, TypeBuilder},
     utils::{get_integer_layout, layout_repeat, BlockExt, ProgramRegistryExt},
 };
 use cairo_lang_sierra::{
@@ -401,9 +401,15 @@ fn build_eval<'ctx, 'this>(
             circuit_info.mul_offsets.len() * MOD_BUILTIN_INSTANCE_SIZE,
         )?;
 
+        // convert circuit output from integer representation to struct representation
+        let gates = gates
+            .into_iter()
+            .map(|value| u384_integer_to_struct(context, ok_block, location, value))
+            .collect::<Result<Vec<_>>>()?;
+
         let n_gates = circuit_info.values.len();
         let gates_array = ok_block.append_op_result(llvm::undef(
-            llvm::r#type::array(IntegerType::new(context, 384).into(), n_gates as u32),
+            llvm::r#type::array(build_u384_struct_type(context), n_gates as u32),
             location,
         ))?;
         let gates_array = ok_block.insert_values(context, location, gates_array, &gates)?;
@@ -813,14 +819,13 @@ fn build_get_output<'ctx, 'this>(
         llvm::r#type::array(IntegerType::new(context, 384).into(), n_gates as u32),
         0,
     )?;
-    let output_integer = entry.extract_value(
+    let output_struct = entry.extract_value(
         context,
         location,
         output_gates,
-        IntegerType::new(context, 384).into(),
+        build_u384_struct_type(context),
         output_idx,
     )?;
-    let output_struct = u384_integer_to_struct(context, entry, location, output_integer)?;
 
     let guarantee_type_id = &info.branch_signatures()[0].vars[1].ty;
     let guarantee_type = registry.build_type(context, helper, metadata, guarantee_type_id)?;
@@ -907,16 +912,7 @@ fn u384_integer_to_struct<'a>(
         block.trunci(limb, u96_type, location)?
     };
 
-    let struct_type = llvm::r#type::r#struct(
-        context,
-        &[
-            IntegerType::new(context, 96).into(),
-            IntegerType::new(context, 96).into(),
-            IntegerType::new(context, 96).into(),
-            IntegerType::new(context, 96).into(),
-        ],
-        false,
-    );
+    let struct_type = build_u384_struct_type(context);
     let struct_value = block.append_op_result(llvm::undef(struct_type, location))?;
 
     block.insert_values(

src/types.rs

@@ -35,7 +35,7 @@ mod bounded_int;
 mod r#box;
 mod builtin_costs;
 mod bytes31;
-mod circuit;
+pub mod circuit;
 mod coupon;
 mod ec_op;
 mod ec_point;

src/types/circuit.rs

@@ -150,8 +150,8 @@ pub fn build_circuit_outputs<'ctx>(
     Ok(llvm::r#type::r#struct(
         context,
         &[
-            llvm::r#type::array(IntegerType::new(context, 384).into(), n_gates as u32),
-            llvm::r#type::array(IntegerType::new(context, 96).into(), 4),
+            llvm::r#type::array(build_u384_struct_type(context), n_gates as u32),
+            build_u384_struct_type(context),
         ],
         false,
     ))
@@ -286,3 +286,16 @@ pub fn layout(
         CircuitTypeConcrete::CircuitPartialOutputs(_) => Ok(Layout::new::<()>()),
     }
 }
+
+pub fn build_u384_struct_type(context: &Context) -> Type<'_> {
+    llvm::r#type::r#struct(
+        context,
+        &[
+            IntegerType::new(context, 96).into(),
+            IntegerType::new(context, 96).into(),
+            IntegerType::new(context, 96).into(),
+            IntegerType::new(context, 96).into(),
+        ],
+        false,
+    )
+}