VM Values Rewrite

external-crates/move/crates/move-cli/tests/sandbox_tests/print_stack_trace/args.exp

@@ -29,7 +29,7 @@ Call Stack:
             [16] CallGeneric(1)
 
         Locals:
-            [0] false
+            [0] (&) false
             [1] [true, false]
             [2] -
 
@@ -47,7 +47,7 @@ Call Stack:
 
         Locals:
             [0] 3
-            [1] 3
+            [1] (&) 3
             [2] -
 
 
@@ -151,7 +151,7 @@ Call Stack:
 
         Locals:
             [0] 3
-            [1] 3
+            [1] (&) 3
             [2] -
 
 

external-crates/move/crates/move-core-types/src/language_storage.rs

@@ -141,7 +141,7 @@ impl TypeTag {
                 | TypeTag::U256
                 | TypeTag::Address
                 | TypeTag::Signer => (),
-                TypeTag::Vector(inner) => find_addresses_recur(account_addresses, &*inner),
+                TypeTag::Vector(inner) => find_addresses_recur(account_addresses, inner),
                 TypeTag::Struct(tag) => {
                     let StructTag {
                         address,

external-crates/move/crates/move-proc-macros/src/lib.rs

@@ -3,7 +3,7 @@
 
 use proc_macro::TokenStream;
 use quote::quote;
-use syn::{parse_macro_input, Data, DataEnum, DeriveInput, ItemFn};
+use syn::{parse_macro_input, Data, DataEnum, DeriveInput, Ident, ItemFn};
 
 /// This macro generates a function `order_to_variant_map` which returns a map
 /// of the position of each variant to the name of the variant.
@@ -111,3 +111,26 @@ pub fn growing_stack(_attr: TokenStream, item: TokenStream) -> TokenStream {
 
     output.into()
 }
+
+/// Procedural macro to parse an identifier and return it with the first letter capitalized.
+#[proc_macro]
+pub fn capitalize(input: TokenStream) -> TokenStream {
+    // Parse the input as an identifier
+    let ident = parse_macro_input!(input as Ident);
+
+    // Convert the identifier to a string
+    let mut ident_str = ident.to_string();
+
+    // Capitalize the first letter
+    ident_str[..1].make_ascii_uppercase();
+
+    // Create a new identifier with the capitalized string
+    let new_ident = Ident::new(&ident_str, ident.span());
+
+    // Generate and return the output TokenStream
+    let output = quote! {
+        #new_ident
+    };
+
+    output.into()
+}

external-crates/move/crates/move-transactional-test-runner/src/vm_test_harness.rs

@@ -372,23 +372,7 @@ pub fn format_vm_error(e: &VMError) -> String {
         Location::Undefined => "undefined".to_owned(),
         Location::Module(id) => format!("0x{}::{}", id.address().short_str_lossless(), id.name()),
     };
-    // format!(
-    //     "{{
-    // major_status: {major_status:?},
-    // sub_status: {sub_status:?},
     // message: {message:?},
-    // location: {location_string},
-    // indices: {indices:?},
-    // offsets: {offsets:?},
-    // }}",
-    //     major_status = e.major_status(),
-    //     sub_status = e.sub_status(),
-    //     message = e.message(),
-    //     location_string = location_string,
-    //     // TODO maybe include source map info?
-    //     indices = e.indices(),
-    //     offsets = e.offsets(),
-    // ) ;
     format!(
         "{{
     major_status: {major_status:?},
@@ -403,6 +387,7 @@ pub fn format_vm_error(e: &VMError) -> String {
         // TODO maybe include source map info?
         indices = e.indices(),
         offsets = e.offsets(),
+        // message = e.message(),
     )
 }
 

external-crates/move/crates/move-unit-test/tests/test_sources/string_abort.move

@@ -0,0 +1,10 @@
+module 0x6::M {
+    #[test]
+    fun unexpected_abort_in_native_function() {
+        abort_in_native()
+    }
+
+    fun abort_in_native() {
+        std::string::internal_sub_string_for_testing(&vector[0], 1, 0);
+    }
+}

external-crates/move/crates/move-unit-test/tests/test_sources/unexpected_abort.move

@@ -31,14 +31,4 @@ module 0x6::M {
     fun unexpected_abort_in_other_function() {
         abort_in_other_function()
     }
-
-
-    #[test]
-    fun unexpected_abort_in_native_function() {
-        abort_in_native()
-    }
-
-    fun abort_in_native() {
-        std::string::internal_sub_string_for_testing(&vector[0], 1, 0);
-    }
 }

external-crates/move/crates/move-vm-runtime/Cargo.toml

@@ -45,6 +45,7 @@ move-compiler.workspace = true
 memory-stats.workspace = true
 tempfile.workspace = true
 move-stdlib.workspace = true
+move-proc-macros.workspace = true
 
 [features]
 default = []

external-crates/move/crates/move-vm-runtime/src/cache/arena.rs

@@ -60,7 +60,32 @@ impl<T> ArenaPointer<T> {
 
     #[inline]
     pub fn to_ref<'a>(self) -> &'a T {
-        to_ref(self.0)
+        to_ref(self.ptr_clone().0)
+    }
+
+    #[inline]
+    pub fn to_mut_ref<'a>(self) -> &'a mut T {
+        to_mut_ref(self.ptr_clone().0)
+    }
+
+    #[inline]
+    pub fn from_ref(t: &T) -> Self {
+        Self(t as *const T)
+    }
+
+    #[inline]
+    pub fn ptr_eq(&self, other: &Self) -> bool {
+        std::ptr::eq(self.0, other.0)
+    }
+
+    #[inline]
+    pub fn ptr_clone(&self) -> Self {
+        Self(self.0)
+    }
+
+    #[inline]
+    pub fn replace_ptr(&mut self, other: ArenaPointer<T>) {
+        self.0 = other.0;
     }
 }
 
@@ -98,6 +123,12 @@ pub fn to_ref<'a, T>(value: *const T) -> &'a T {
     unsafe { &*value as &T }
 }
 
+#[allow(clippy::not_unsafe_ptr_arg_deref)]
+#[inline]
+pub fn to_mut_ref<'a, T>(value: *const T) -> &'a mut T {
+    unsafe { &mut *(value as *mut T) }
+}
+
 // -----------------------------------------------
 // Trait Implementations
 // -----------------------------------------------
@@ -120,16 +151,27 @@ impl<T: ::std::fmt::Debug> ::std::fmt::Debug for ArenaPointer<T> {
 // Pointer equality
 impl<T> PartialEq for ArenaPointer<T> {
     fn eq(&self, other: &Self) -> bool {
-        std::ptr::eq(self.0, other.0)
+        self.ptr_eq(other)
     }
 }
 
 impl<T> Eq for ArenaPointer<T> {}
 
 impl<T> Clone for ArenaPointer<T> {
+    #[allow(clippy::non_canonical_clone_impl)]
     fn clone(&self) -> Self {
-        *self
+        self.ptr_clone()
     }
 }
 
 impl<T> Copy for ArenaPointer<T> {}
+
+impl<T> From<Box<T>> for ArenaPointer<T> {
+    fn from(boxed: Box<T>) -> Self {
+        // Use `Box::into_raw` to extract the raw pointer from the box.
+        let raw_ptr: *const T = Box::into_raw(boxed);
+
+        // Create an `ArenaPointer` from the raw pointer.
+        ArenaPointer(raw_ptr)
+    }
+}

external-crates/move/crates/move-vm-runtime/src/cache/identifier_interner.rs

@@ -10,7 +10,7 @@ use move_core_types::{
 use lasso::{Spur, ThreadedRodeo};
 
 /// A wrapper around a lasso ThreadedRoade with some niceties to make it easier to use in the VM.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct IdentifierInterner(ThreadedRodeo);
 
 pub type IdentifierKey = Spur;
@@ -81,9 +81,3 @@ impl IdentifierInterner {
         }
     }
 }
-
-impl Default for IdentifierInterner {
-    fn default() -> Self {
-        Self(ThreadedRodeo::default())
-    }
-}

external-crates/move/crates/move-vm-runtime/src/cache/type_cache.rs

@@ -64,7 +64,7 @@ impl CrossVersionPackageCache {
         type_args: Vec<Type>,
         datatype: DatatypeInfo,
     ) -> PartialVMResult<&DatatypeInfo> {
-        if self.cached_types.contains(&key) {
+        if self.cached_types.contains(key) {
             let module_name = string_interner.resolve_string(&key.module_name, "module name")?;
             let member_name = string_interner.resolve_string(&key.module_name, "member name")?;
             return Err(
@@ -89,7 +89,7 @@ impl CrossVersionPackageCache {
     }
 
     pub fn contains_cached_type(&self, key: &IntraPackageKey) -> bool {
-        self.cached_types.contains(&key)
+        self.cached_types.contains(key)
     }
 
     pub fn resolve_type_by_name(

external-crates/move/crates/move-vm-runtime/src/dev_utils/dbg_print.rs

@@ -13,9 +13,10 @@ pub struct DebugFlags {
 pub const DEBUG_FLAGS: DebugFlags = DebugFlags {
     function_list_sizes: true,
     function_resolution: true,
-    eval_step: false,
+    eval_step: true,
 };
 
+#[cfg(debug_assertions)]
 #[macro_export]
 macro_rules! dbg_println {
     ($( $args:expr ),*$(,)?) => {

external-crates/move/crates/move-vm-runtime/src/dev_utils/storage.rs

@@ -224,7 +224,7 @@ impl InMemoryStorage {
             println!("Linkage context: {:?}", stored_package.linkage_context);
             println!("Type origins: {:?}", stored_package.type_origin_table);
             println!("Modules:");
-            for (module_name, _blob) in &stored_package.modules {
+            for module_name in stored_package.modules.keys() {
                 println!("\tModule: {:?}", module_name);
             }
         }

external-crates/move/crates/move-vm-runtime/src/dev_utils/vm_test_adapter.rs

@@ -58,7 +58,7 @@ pub trait VMTestAdapter<Storage: MoveResolver + Sync + Send> {
         let pkg = self.get_package_from_store(&package_id)?;
         Ok(LinkageContext::new(
             package_id,
-            HashMap::from_iter(pkg.linkage_table.into_iter()),
+            HashMap::from_iter(pkg.linkage_table),
         ))
     }
 

external-crates/move/crates/move-vm-runtime/src/execution/dispatch_tables.rs

@@ -178,12 +178,12 @@ impl VMDispatchTables {
         def_idx: &VTableKey,
         depth_cache: &mut BTreeMap<VTableKey, DepthFormula>,
     ) -> PartialVMResult<DepthFormula> {
-        let datatype = self.resolve_type(&VTableKey::from(def_idx.clone()))?.1;
+        let datatype = self.resolve_type(&def_idx.clone())?.1;
         // If we've already computed this datatypes depth, no more work remains to be done.
         if let Some(form) = &datatype.depth {
             return Ok(form.clone());
         }
-        if let Some(form) = depth_cache.get(&def_idx) {
+        if let Some(form) = depth_cache.get(def_idx) {
             return Ok(form.clone());
         }
 
@@ -265,7 +265,7 @@ impl VMDispatchTables {
     }
 
     pub fn type_at(&self, idx: &VTableKey) -> PartialVMResult<Arc<CachedDatatype>> {
-        Ok(self.resolve_type(&VTableKey::from(idx.clone()))?.1)
+        Ok(self.resolve_type(&idx.clone())?.1)
     }
 
     // -------------------------------------------