LedgerUpdateOutput drop with default dropper

consensus/proptest-regressions/block_storage/block_store_test.txt

@@ -0,0 +1,7 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc ed0a79396ca140089b0c345b61c5342e222e2620f389021006acb2ccc1af76b9 # shrinks to (private_keys, blocks) = ([<elided secret for PrivateKey>, <elided secret for PrivateKey>, <elided secret for PrivateKey>, <elided secret for PrivateKey>, <elided secret for PrivateKey>, <elided secret for PrivateKey>, <elided secret for PrivateKey>, <elided secret for PrivateKey>, <elided secret for PrivateKey>, <elided secret for PrivateKey>], [[id: 43bf836b, author: (NIL), epoch: 1, round: 00, parent_id: 00000000, timestamp: 0]])

crates/aptos-drop-helper/Cargo.toml

@@ -15,5 +15,6 @@ rust-version = { workspace = true }
 [dependencies]
 aptos-infallible = { workspace = true }
 aptos-metrics-core = { workspace = true }
+derive_more = { workspace = true }
 once_cell = { workspace = true }
 threadpool = { workspace = true }

crates/aptos-drop-helper/src/lib.rs

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::async_concurrent_dropper::AsyncConcurrentDropper;
+use derive_more::{Deref, DerefMut};
 use once_cell::sync::Lazy;
+use std::mem::ManuallyDrop;
 
 pub mod async_concurrent_dropper;
 pub mod async_drop_queue;
@@ -11,8 +13,31 @@ mod metrics;
 pub static DEFAULT_DROPPER: Lazy<AsyncConcurrentDropper> =
     Lazy::new(|| AsyncConcurrentDropper::new("default", 32, 8));
 
-/// Arc<T: ArcAsyncDrop> will be `Send + 'static`, which is requried to be able to drop Arc<T>
+/// Arc<T: ArcAsyncDrop> will be `Send + 'static`, which is required to be able to drop Arc<T>
 /// in another thread
 pub trait ArcAsyncDrop: Send + Sync + 'static {}
 
 impl<T: Send + Sync + 'static> ArcAsyncDrop for T {}
+
+#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Deref, DerefMut)]
+#[repr(transparent)]
+pub struct DropHelper<T: Send + 'static> {
+    #[deref]
+    #[deref_mut]
+    inner: ManuallyDrop<T>,
+}
+
+impl<T: Send + 'static> DropHelper<T> {
+    pub fn new(inner: T) -> Self {
+        Self {
+            inner: ManuallyDrop::new(inner),
+        }
+    }
+}
+
+impl<T: Send + 'static> Drop for DropHelper<T> {
+    fn drop(&mut self) {
+        let inner = unsafe { ManuallyDrop::take(&mut self.inner) };
+        DEFAULT_DROPPER.schedule_drop(inner);
+    }
+}

execution/executor-types/Cargo.toml

@@ -15,6 +15,7 @@ rust-version = { workspace = true }
 [dependencies]
 anyhow = { workspace = true }
 aptos-crypto = { workspace = true }
+aptos-drop-helper = { workspace = true }
 aptos-scratchpad = { workspace = true }
 aptos-secure-net = { workspace = true }
 aptos-storage-interface = { workspace = true }

execution/executor-types/src/ledger_update_output.rs

@@ -6,6 +6,7 @@
 use crate::StateComputeResult;
 use anyhow::{ensure, Result};
 use aptos_crypto::HashValue;
+use aptos_drop_helper::DropHelper;
 use aptos_storage_interface::cached_state_view::ShardedStateCache;
 use aptos_types::{
     contract_event::ContractEvent,
@@ -24,7 +25,7 @@ use std::sync::Arc;
 #[derive(Clone, Debug, Default, Deref)]
 pub struct LedgerUpdateOutput {
     #[deref]
-    inner: Arc<Inner>,
+    inner: Arc<DropHelper<Inner>>,
 }
 
 impl LedgerUpdateOutput {
@@ -76,7 +77,7 @@ impl LedgerUpdateOutput {
 
     fn new_impl(inner: Inner) -> Self {
         Self {
-            inner: Arc::new(inner),
+            inner: Arc::new(DropHelper::new(inner)),
         }
     }