[vm] avoid cloning metadata

Author: Zekun Li

aptos-move/aptos-vm-types/src/module_and_script_storage/state_view_adapter.rs

@@ -21,7 +21,6 @@ use move_binary_format::{
 };
 use move_core_types::{
     account_address::AccountAddress, identifier::IdentStr, language_storage::ModuleId,
-    metadata::Metadata,
 };
 use move_vm_runtime::{
     ambassador_impl_ModuleStorage, ambassador_impl_WithRuntimeEnvironment, AsUnsyncCodeStorage,

aptos-move/aptos-vm/src/aptos_vm.rs

@@ -678,10 +678,10 @@ impl AptosVM {
             }
 
             let info = module_storage
-                .unmetered_get_module_metadata(module_id.address(), module_id.name())
+                .unmetered_get_deserialized_module(module_id.address(), module_id.name())
                 .ok()
                 .flatten()
-                .and_then(|metadata| get_metadata(&metadata))
+                .and_then(|module| get_metadata(&module.metadata))
                 .and_then(|m| m.extract_abort_info(code));
 
             ExecutionStatus::MoveAbort {
@@ -3434,14 +3434,16 @@ pub(crate) fn should_create_account_resource(
         //   Account lives at a special address, so we should not be charging for it and unmetered
         //   access is safe. There are tests that ensure that address is always special.
         assert!(account_tag.address.is_special());
-        let metadata = module_storage
-            .unmetered_get_existing_module_metadata(&account_tag.address, &account_tag.module)?;
+        let module = module_storage.unmetered_get_existing_deserialized_module(
+            &account_tag.address,
+            &account_tag.module,
+        )?;
 
         let (maybe_bytes, _) = resolver
             .get_resource_bytes_with_metadata_and_layout(
                 &txn_data.sender(),
                 &account_tag,
-                &metadata,
+                &module.metadata,
                 None,
             )
             .map_err(|e| e.finish(Location::Undefined))?;

aptos-move/aptos-vm/src/keyless_validation.rs

@@ -61,12 +61,12 @@ fn get_resource_on_chain_at_addr<T: MoveStructType + for<'a> Deserialize<'a>>(
     // INVARIANT:
     //   The struct should be defined at core (0x1) address, so we do not require metering for any
     //   module loading.
-    let metadata = module_storage
-        .unmetered_get_existing_module_metadata(&struct_tag.address, &struct_tag.module)
+    let module = module_storage
+        .unmetered_get_existing_deserialized_module(&struct_tag.address, &struct_tag.module)
         .map_err(|e| e.into_vm_status())?;
 
     let bytes = resolver
-        .get_resource_bytes_with_metadata_and_layout(addr, &struct_tag, &metadata, None)
+        .get_resource_bytes_with_metadata_and_layout(addr, &struct_tag, &module.metadata, None)
         .map_err(|e| e.finish(Location::Undefined).into_vm_status())?
         .0
         .ok_or_else(|| {

aptos-move/aptos-vm/src/move_vm_ext/session/mod.rs

@@ -367,14 +367,14 @@ where
                     // INVARIANT:
                     //   We do not need to meter metadata access here. If this resource is in data
                     //   cache, we must have already fetched metadata for its tag.
-                    let metadata = module_storage
-                        .unmetered_get_existing_module_metadata(
+                    let module = module_storage
+                        .unmetered_get_existing_deserialized_module(
                             &struct_tag.address,
                             &struct_tag.module,
                         )
                         .map_err(|e| e.to_partial())?;
 
-                    get_resource_group_member_from_metadata(&struct_tag, &metadata)
+                    get_resource_group_member_from_metadata(&struct_tag, &module.metadata)
                 };
 
                 if let Some(resource_group_tag) = resource_group_tag {

third_party/move/move-vm/integration-tests/src/tests/module_storage_tests.rs

@@ -77,10 +77,6 @@ fn test_module_does_not_exist() {
     let result = module_storage.unmetered_get_module_size(&AccountAddress::ZERO, ident_str!("a"));
     assert_none!(assert_ok!(result));
 
-    let result =
-        module_storage.unmetered_get_module_metadata(&AccountAddress::ZERO, ident_str!("a"));
-    assert_none!(assert_ok!(result));
-
     let result =
         module_storage.unmetered_get_deserialized_module(&AccountAddress::ZERO, ident_str!("a"));
     assert_none!(assert_ok!(result));
@@ -119,9 +115,9 @@ fn test_deserialized_caching() {
 
     let module_storage = module_bytes_storage.into_unsync_module_storage();
 
-    let result = module_storage.unmetered_get_module_metadata(a_id.address(), a_id.name());
-    let expected = make_module("a", vec!["b", "c"], vec![]).0.metadata;
-    assert_eq!(assert_some!(assert_ok!(result)), expected);
+    let result = module_storage.unmetered_get_deserialized_module(a_id.address(), a_id.name());
+    let expected = make_module("a", vec!["b", "c"], vec![]).0;
+    assert_eq!(assert_some!(assert_ok!(result)).as_ref(), &expected);
     module_storage.assert_cached_state(vec![&a_id], vec![]);
 
     let result = module_storage.unmetered_get_deserialized_module(c_id.address(), c_id.name());

third_party/move/move-vm/runtime/src/data_cache.rs

@@ -278,7 +278,7 @@ impl TransactionDataCache {
         )?;
 
         let (data, bytes_loaded) = {
-            let metadata = metadata_loader.load_module_metadata(
+            let module = metadata_loader.load_module_for_metadata(
                 gas_meter,
                 traversal_context,
                 &struct_tag.module_id(),
@@ -289,7 +289,7 @@ impl TransactionDataCache {
             resource_resolver.get_resource_bytes_with_metadata_and_layout(
                 addr,
                 &struct_tag,
-                &metadata,
+                &module.metadata,
                 layout_with_delayed_fields.layout_when_contains_delayed_fields(),
             )?
         };

third_party/move/move-vm/runtime/src/native_functions.rs

@@ -30,7 +30,6 @@ use move_core_types::{
     gas_algebra::{InternalGas, NumBytes},
     identifier::{IdentStr, Identifier},
     language_storage::{ModuleId, TypeTag},
-    metadata::Metadata,
     value::MoveTypeLayout,
     vm_status::StatusCode,
 };

third_party/move/move-vm/runtime/src/storage/implementations/unsync_code_storage.rs

@@ -19,7 +19,6 @@ use bytes::Bytes;
 use move_binary_format::{errors::VMResult, file_format::CompiledScript, CompiledModule};
 use move_core_types::{
     account_address::AccountAddress, identifier::IdentStr, language_storage::ModuleId,
-    metadata::Metadata,
 };
 use move_vm_types::code::{
     ambassador_impl_ScriptCache, Code, ModuleBytesStorage, ScriptCache, UnsyncScriptCache,

third_party/move/move-vm/runtime/src/storage/implementations/unsync_module_storage.rs

@@ -17,7 +17,6 @@ use bytes::Bytes;
 use move_binary_format::{errors::VMResult, CompiledModule};
 use move_core_types::{
     account_address::AccountAddress, identifier::IdentStr, language_storage::ModuleId,
-    metadata::Metadata,
 };
 use move_vm_types::{
     code::{

third_party/move/move-vm/runtime/src/storage/loader/eager.rs

@@ -19,11 +19,11 @@ use move_binary_format::{
     access::ScriptAccess,
     errors::{PartialVMError, PartialVMResult, VMResult},
     file_format::CompiledScript,
+    CompiledModule,
 };
 use move_core_types::{
     identifier::IdentStr,
     language_storage::{ModuleId, TypeTag},
-    metadata::Metadata,
     vm_status::StatusCode,
 };
 use move_vm_types::{
@@ -237,16 +237,16 @@ impl<'a, T> ModuleMetadataLoader for EagerLoader<'a, T>
 where
     T: ModuleStorage,
 {
-    fn load_module_metadata(
+    fn load_module_for_metadata(
         &self,
         _gas_meter: &mut impl DependencyGasMeter,
         _traversal_context: &mut TraversalContext,
         module_id: &ModuleId,
-    ) -> PartialVMResult<Vec<Metadata>> {
+    ) -> PartialVMResult<Arc<CompiledModule>> {
         // Note:
         //   For backwards compatibility, metadata accesses were never metered.
         self.module_storage
-            .unmetered_get_existing_module_metadata(module_id.address(), module_id.name())
+            .unmetered_get_existing_deserialized_module(module_id.address(), module_id.name())
             .map_err(|err| err.to_partial())
     }
 }