Inlines account_data_region_memory_state().

Author: Lichtso

program-runtime/src/serialization.rs

@@ -8,7 +8,7 @@ use {
     solana_sbpf::{
         aligned_memory::{AlignedMemory, Pod},
         ebpf::{HOST_ALIGN, MM_INPUT_START},
-        memory_region::{MemoryRegion, MemoryState},
+        memory_region::MemoryRegion,
     },
     solana_sdk_ids::bpf_loader_deprecated,
     solana_system_interface::MAX_PERMITTED_DATA_LENGTH,
@@ -102,16 +102,16 @@ impl Serializer {
             self.push_region();
             let vaddr = self.vaddr;
             if !account.get_data().is_empty() {
-                let region = match account_data_region_memory_state(account) {
-                    MemoryState::Readable => {
-                        MemoryRegion::new_readonly(account.get_data(), self.vaddr)
-                    }
-                    MemoryState::Writable => {
-                        MemoryRegion::new_writable(account.get_data_mut()?, self.vaddr)
-                    }
-                    MemoryState::Cow(region_index) => {
-                        MemoryRegion::new_cow(account.get_data(), self.vaddr, region_index)
-                    }
+                let region = if account.can_data_be_changed().is_err() {
+                    MemoryRegion::new_readonly(account.get_data(), self.vaddr)
+                } else if account.is_shared() {
+                    MemoryRegion::new_cow(
+                        account.get_data(),
+                        self.vaddr,
+                        account.get_index_in_transaction() as u64,
+                    )
+                } else {
+                    MemoryRegion::new_writable(account.get_data_mut()?, self.vaddr)
                 };
                 self.vaddr += region.len;
                 self.regions.push(region);
@@ -607,18 +607,6 @@ fn deserialize_parameters_aligned<I: IntoIterator<Item = usize>>(
     Ok(())
 }
 
-pub fn account_data_region_memory_state(account: &BorrowedAccount<'_>) -> MemoryState {
-    if account.can_data_be_changed().is_ok() {
-        if account.is_shared() {
-            MemoryState::Cow(account.get_index_in_transaction() as u64)
-        } else {
-            MemoryState::Writable
-        }
-    } else {
-        MemoryState::Readable
-    }
-}
-
 #[cfg(test)]
 #[allow(clippy::indexing_slicing)]
 mod tests {

programs/bpf_loader/src/syscalls/cpi.rs

@@ -5,8 +5,7 @@ use {
     solana_loader_v3_interface::instruction as bpf_loader_upgradeable,
     solana_measure::measure::Measure,
     solana_program_runtime::{
-        invoke_context::SerializedAccountMetadata,
-        serialization::{account_data_region_memory_state, ZEROED_REALLOC_PADDING},
+        invoke_context::SerializedAccountMetadata, serialization::ZEROED_REALLOC_PADDING,
     },
     solana_sbpf::{
         ebpf,
@@ -1273,9 +1272,14 @@ fn update_caller_account_perms(
 
     let data_region = account_data_region(memory_mapping, *vm_data_addr, *original_data_len)?;
     if let Some(region) = data_region {
-        region
-            .state
-            .set(account_data_region_memory_state(callee_account));
+        let memory_state = if callee_account.can_data_be_changed().is_err() {
+            MemoryState::Readable
+        } else if callee_account.is_shared() {
+            MemoryState::Cow(callee_account.get_index_in_transaction() as u64)
+        } else {
+            MemoryState::Writable
+        };
+        region.state.set(memory_state);
     }
     let realloc_region = account_realloc_region(
         memory_mapping,