fix: restore auto-merged files

Author: mansur20478

crates/vm/derive/src/tco.rs

@@ -56,7 +56,7 @@ pub fn tco_impl(item: TokenStream) -> TokenStream {
     let handler_fn = quote! {
         #[inline(never)]
         unsafe fn #handler_name #handler_generics (
-            interpreter: &::openvm_circuit::arch::interpreter::InterpretedInstance<'_, #f_type, #ctx_type>,
+            interpreter: &::openvm_circuit::arch::interpreter::InterpretedInstance<#f_type, #ctx_type>,
             exec_state: &mut ::openvm_circuit::arch::VmExecState<
                 #f_type,
                 ::openvm_circuit::system::memory::online::GuestMemory,

crates/vm/src/arch/aot/metered_execute.rs

@@ -22,18 +22,15 @@ use crate::{
     },
     system::memory::online::GuestMemory,
 };
-static_assertions::assert_impl_all!(
-    AotInstance<'static, p3_baby_bear::BabyBear, MeteredCtx>: Send,
-    Sync
-);
+static_assertions::assert_impl_all!(AotInstance<p3_baby_bear::BabyBear, MeteredCtx>: Send, Sync);
 
-impl<'a, F> AotInstance<'a, F, MeteredCtx>
+impl<F> AotInstance<F, MeteredCtx>
 where
     F: PrimeField32,
 {
     /// Creates a new instance for metered execution.
     pub fn new_metered<E>(
-        inventory: &'a ExecutorInventory<E>,
+        inventory: &ExecutorInventory<E>,
         exe: &VmExe<F>,
         executor_idx_to_air_idx: &[usize],
     ) -> Result<Self, StaticProgramError>
@@ -68,15 +65,15 @@ where
             start.elapsed().as_millis()
         );
         Ok(Self {
-            system_config: inventory.config(),
+            system_config: inventory.config().clone(),
             pre_compute_buf,
             pre_compute_insns,
             pc_start: exe.pc_start,
             init_memory,
             lib,
         })
     }
-    fn create_metered_asm<E>(
+    pub fn create_metered_asm<E>(
         exe: &VmExe<F>,
         inventory: &ExecutorInventory<E>,
         executor_idx_to_air_idx: &[usize],

crates/vm/src/arch/aot/mod.rs

@@ -24,9 +24,9 @@ mod pure;
 /// Verify installation by `as --version`, `ar --version` and `cargo --version`
 /// Refer to AOT.md for further clarification about AOT
 ///  
-pub struct AotInstance<'a, F, Ctx> {
+pub struct AotInstance<F, Ctx> {
     init_memory: SparseMemoryImage,
-    system_config: &'a SystemConfig,
+    system_config: SystemConfig,
     // SAFETY: this is not actually dead code, but `pre_compute_insns` contains raw pointer refers
     // to this buffer.
     #[allow(dead_code)]
@@ -43,13 +43,18 @@ type AsmRunFn = unsafe extern "C" fn(
     instret_left: u64,
 );
 
-impl<'a, F, Ctx> AotInstance<'a, F, Ctx>
+impl<F, Ctx> AotInstance<F, Ctx>
 where
     F: PrimeField32,
     Ctx: ExecutionCtxTrait,
 {
     pub fn create_initial_vm_state(&self, inputs: impl Into<Streams<F>>) -> VmState<F> {
-        VmState::initial(self.system_config, &self.init_memory, self.pc_start, inputs)
+        VmState::initial(
+            &self.system_config,
+            &self.init_memory,
+            self.pc_start,
+            inputs,
+        )
     }
 
     fn push_external_registers() -> String {

crates/vm/src/arch/aot/pure.rs

@@ -23,16 +23,13 @@ use crate::{
     system::memory::online::GuestMemory,
 };
 
-static_assertions::assert_impl_all!(
-    AotInstance<'static, p3_baby_bear::BabyBear, ExecutionCtx>: Send,
-    Sync
-);
+static_assertions::assert_impl_all!(AotInstance<p3_baby_bear::BabyBear, ExecutionCtx>: Send, Sync);
 
-impl<'a, F> AotInstance<'a, F, ExecutionCtx>
+impl<'a, F> AotInstance<F, ExecutionCtx>
 where
     F: PrimeField32,
 {
-    fn create_pure_asm<E>(
+    pub fn create_pure_asm<E>(
         exe: &VmExe<F>,
         inventory: &ExecutorInventory<E>,
         pre_compute_insns_ptr: *const PreComputeInstruction<F, ExecutionCtx>,
@@ -268,7 +265,7 @@ where
         let init_memory = exe.init_memory.clone();
 
         Ok(Self {
-            system_config: inventory.config(),
+            system_config: inventory.config().clone(),
             pre_compute_buf,
             pre_compute_insns,
             pc_start: exe.pc_start,

crates/vm/src/arch/execution.rs

@@ -137,7 +137,7 @@ pub type ExecuteFunc<F, CTX> =
 ///   pointer is typeless to avoid self-referential types.
 #[cfg(feature = "tco")]
 pub type Handler<F, CTX> = unsafe fn(
-    interpreter: &InterpretedInstance<'_, F, CTX>,
+    interpreter: &InterpretedInstance<F, CTX>,
     exec_state: &mut VmExecState<F, GuestMemory, CTX>,
 );