array arena (#1614)

Author: TomerStarkware

src/executor.rs

@@ -14,7 +14,7 @@ use crate::{
         SEGMENT_ARENA_BUILTIN_SIZE,
     },
     native_panic,
-    runtime::{BLAKE_CALL_COUNT, BOX_ARENA, BUILTIN_COSTS},
+    runtime::{BLAKE_CALL_COUNT, BUILTIN_COSTS, EXECUTION_ARENA},
     starknet::{handler::StarknetSyscallHandlerCallbacks, StarknetSyscallHandler},
     types::TypeBuilder,
     utils::{BuiltinCosts, RangeExt},
@@ -364,7 +364,7 @@ fn invoke_dynamic(
 pub(crate) struct InvocationGuard {
     builtin_costs: BuiltinCosts,
     blake_call_count: u64,
-    box_arena: Bump,
+    execution_arena: Bump,
     #[cfg(feature = "with-cheatcode")]
     syscall_handler: Option<*mut ()>,
 }
@@ -379,7 +379,8 @@ impl InvocationGuard {
         Self {
             builtin_costs: BUILTIN_COSTS.replace(builtin_costs),
             blake_call_count: BLAKE_CALL_COUNT.with(|c| c.replace(0)),
-            box_arena: BOX_ARENA.with(|c| std::mem::replace(&mut *c.borrow_mut(), Bump::new())),
+            execution_arena: EXECUTION_ARENA
+                .with(|c| std::mem::replace(&mut *c.borrow_mut(), Bump::new())),
             #[cfg(feature = "with-cheatcode")]
             syscall_handler: syscall_handler.map(|ptr| {
                 let previous_value = crate::starknet::SYSCALL_HANDLER_VTABLE.get();
@@ -394,7 +395,7 @@ impl Drop for InvocationGuard {
     fn drop(&mut self) {
         BUILTIN_COSTS.set(self.builtin_costs);
         BLAKE_CALL_COUNT.with(|c| c.set(self.blake_call_count));
-        BOX_ARENA.with(|c| std::mem::swap(&mut *c.borrow_mut(), &mut self.box_arena));
+        EXECUTION_ARENA.with(|c| std::mem::swap(&mut *c.borrow_mut(), &mut self.execution_arena));
         #[cfg(feature = "with-cheatcode")]
         if let Some(previous_value) = self.syscall_handler {
             crate::starknet::SYSCALL_HANDLER_VTABLE.set(previous_value);

src/executor/contract.rs

@@ -53,7 +53,7 @@ use crate::{
     types::{array::ArrayMetadata, TypeBuilder},
     utils::{
         decode_error_message, generate_function_name, get_integer_layout, get_types_total_size,
-        libc_free, libc_malloc, BuiltinCosts,
+        BuiltinCosts,
     },
     OptLevel,
 };
@@ -499,7 +499,12 @@ impl AotContractExecutor {
 
         let data_ptr = match args.len() {
             0 => std::ptr::null_mut(),
-            _ => unsafe { libc_malloc(felt_layout.size() * args.len()).cast::<u8>() },
+            _ => unsafe {
+                crate::runtime::cairo_native__arena_alloc(
+                    (felt_layout.size() * args.len()) as u64,
+                    felt_layout.align() as u64,
+                )
+            },
         };
 
         for (idx, elem) in args.iter().enumerate() {
@@ -513,14 +518,17 @@ impl AotContractExecutor {
             };
         }
 
-        // Allocate metadata struct: { refcount: u32, max_len: u32, data_ptr: *mut () }
+        // Allocate metadata struct: { max_len: u32, data_ptr: *mut () }
         let metadata_ptr = if data_ptr.is_null() {
             ptr::null_mut()
         } else {
             unsafe {
-                let metadata = libc_malloc(size_of::<ArrayMetadata>()).cast::<ArrayMetadata>();
+                let metadata = crate::runtime::cairo_native__arena_alloc(
+                    size_of::<ArrayMetadata>() as u64,
+                    align_of::<ArrayMetadata>() as u64,
+                )
+                .cast::<ArrayMetadata>();
                 metadata.write(ArrayMetadata {
-                    refcount: 1,
                     max_len: len_u32,
                     data_ptr,
                 });
@@ -679,15 +687,6 @@ impl AotContractExecutor {
 
                 array_value.push(Felt::from_bytes_le(&data));
             }
-
-            unsafe {
-                native_assert!(
-                    metadata.refcount == 1,
-                    "return array should have a reference count of 1"
-                );
-                libc_free(data_ptr.cast());
-                libc_free(metadata_ptr.cast());
-            }
         }
 
         let error_msg = match tag {