@@ -571,7 +571,7 @@ impl<'a> Context<'a> {
571571 AcirValue :: Array ( _) => {
572572 let block_id = self . block_id ( param_id) ;
573573 let len = if matches ! ( typ, Type :: Array ( _, _) ) {
574- typ. flattened_size ( )
574+ typ. flattened_size ( ) as usize
575575 } else {
576576 return Err ( InternalError :: Unexpected {
577577 expected : "Block params should be an array" . to_owned ( ) ,
@@ -816,7 +816,9 @@ impl<'a> Context<'a> {
816816 let inputs = vecmap ( arguments, |arg| self . convert_value ( * arg, dfg) ) ;
817817 let output_count = result_ids
818818 . iter ( )
819- . map ( |result_id| dfg. type_of_value ( * result_id) . flattened_size ( ) )
819+ . map ( |result_id| {
820+ dfg. type_of_value ( * result_id) . flattened_size ( ) as usize
821+ } )
820822 . sum ( ) ;
821823
822824 let Some ( acir_function_id) =
@@ -948,7 +950,7 @@ impl<'a> Context<'a> {
948950 let block_id = self . block_id ( & array_id) ;
949951 let array_typ = dfg. type_of_value ( array_id) ;
950952 let len = if matches ! ( array_typ, Type :: Array ( _, _) ) {
951- array_typ. flattened_size ( )
953+ array_typ. flattened_size ( ) as usize
952954 } else {
953955 Self :: flattened_value_size ( & output)
954956 } ;
@@ -1444,7 +1446,7 @@ impl<'a> Context<'a> {
14441446 // a separate SSA value and restrictions on slice indices should be generated elsewhere in the SSA.
14451447 let array_typ = dfg. type_of_value ( array) ;
14461448 let array_len = if !array_typ. contains_slice_element ( ) {
1447- array_typ. flattened_size ( )
1449+ array_typ. flattened_size ( ) as usize
14481450 } else {
14491451 self . flattened_slice_size ( array, dfg)
14501452 } ;
@@ -1539,7 +1541,7 @@ impl<'a> Context<'a> {
15391541 let value = self . convert_value ( array, dfg) ;
15401542 let array_typ = dfg. type_of_value ( array) ;
15411543 let len = if !array_typ. contains_slice_element ( ) {
1542- array_typ. flattened_size ( )
1544+ array_typ. flattened_size ( ) as usize
15431545 } else {
15441546 self . flattened_slice_size ( array, dfg)
15451547 } ;
@@ -1810,7 +1812,7 @@ impl<'a> Context<'a> {
18101812
18111813 return_values
18121814 . iter ( )
1813- . fold ( 0 , |acc, value_id| acc + dfg. type_of_value ( * value_id) . flattened_size ( ) )
1815+ . fold ( 0 , |acc, value_id| acc + dfg. type_of_value ( * value_id) . flattened_size ( ) as usize )
18141816 }
18151817
18161818 /// Converts an SSA terminator's return values into their ACIR representations
@@ -2156,7 +2158,7 @@ impl<'a> Context<'a> {
21562158 let inputs = vecmap ( & arguments_no_slice_len, |arg| self . convert_value ( * arg, dfg) ) ;
21572159
21582160 let output_count = result_ids. iter ( ) . fold ( 0usize , |sum, result_id| {
2159- sum + dfg. try_get_array_length ( * result_id) . unwrap_or ( 1 )
2161+ sum + dfg. try_get_array_length ( * result_id) . unwrap_or ( 1 ) as usize
21602162 } ) ;
21612163
21622164 let vars = self . acir_context . black_box_function ( black_box, inputs, output_count) ?;
@@ -2180,7 +2182,7 @@ impl<'a> Context<'a> {
21802182 endian,
21812183 field,
21822184 radix,
2183- array_length as u32 ,
2185+ array_length,
21842186 result_type[ 0 ] . clone ( ) . into ( ) ,
21852187 )
21862188 . map ( |array| vec ! [ array] )
@@ -2194,12 +2196,7 @@ impl<'a> Context<'a> {
21942196 } ;
21952197
21962198 self . acir_context
2197- . bit_decompose (
2198- endian,
2199- field,
2200- array_length as u32 ,
2201- result_type[ 0 ] . clone ( ) . into ( ) ,
2202- )
2199+ . bit_decompose ( endian, field, array_length, result_type[ 0 ] . clone ( ) . into ( ) )
22032200 . map ( |array| vec ! [ array] )
22042201 }
22052202 Intrinsic :: ArrayLen => {
@@ -2220,7 +2217,7 @@ impl<'a> Context<'a> {
22202217 let acir_value = self . convert_value ( slice_contents, dfg) ;
22212218
22222219 let array_len = if !slice_typ. contains_slice_element ( ) {
2223- slice_typ. flattened_size ( )
2220+ slice_typ. flattened_size ( ) as usize
22242221 } else {
22252222 self . flattened_slice_size ( slice_contents, dfg)
22262223 } ;
0 commit comments