[vm] Supress paranoid checks for trusted code (#17461)

* [vm] Suppress paranoid checks for trusted code

This introduces the concept of 'trusted code' in the VM. For now this is defined as code at a 'special' address (0x1-0xf), but this can later be extended.

This also adds nmew transactional tests.  Adding transactional tests.

We also need to move existing tests out of the default trusted 'domain' (0x1-0xf), so refactoring some test files.

* Addressing reviewer comments.

* Ensuring that during tests, no code is trusted. Also adds a mechanism to have different feature flag sets during testing and in prod.

* Addressing reviewer comments

* Reverting change of feature flags for test genesis.

* Updating calibration values for aptos-move/e2e-benchmark and testsuite/single_node_performance.

Author: wrwg

Cargo.lock

@@ -150,6 +150,7 @@ pub enum FeatureFlag {
     CalculateTransactionFeeForDistribution,
     DistributeTransactionFee,
     MonotonicallyIncreasingCounter,
+    EnableTrustedCode,
 }
 
 fn generate_features_blob(writer: &CodeWriter, data: &[u64]) {
@@ -399,6 +400,7 @@ impl From<FeatureFlag> for AptosFeatureFlag {
             FeatureFlag::MonotonicallyIncreasingCounter => {
                 AptosFeatureFlag::MONOTONICALLY_INCREASING_COUNTER
             },
+            FeatureFlag::EnableTrustedCode => AptosFeatureFlag::ENABLE_TRUSTED_CODE,
         }
     }
 }
@@ -575,6 +577,7 @@ impl From<AptosFeatureFlag> for FeatureFlag {
             AptosFeatureFlag::MONOTONICALLY_INCREASING_COUNTER => {
                 FeatureFlag::MonotonicallyIncreasingCounter
             },
+            AptosFeatureFlag::ENABLE_TRUSTED_CODE => FeatureFlag::EnableTrustedCode,
         }
     }
 }

aptos-move/aptos-release-builder/src/components/feature_flags.rs

@@ -189,6 +189,7 @@ pub fn aptos_prod_vm_config(
             .is_call_tree_and_instruction_vm_cache_enabled(),
         enable_lazy_loading: features.is_lazy_loading_enabled(),
         enable_depth_checks,
+        optimize_trusted_code: features.is_trusted_code_enabled(),
         paranoid_ref_checks,
     };
 

aptos-move/aptos-vm-environment/src/prod_configs.rs

@@ -2823,9 +2823,9 @@ impl AptosVM {
                             speculative_error!(
                                 log_context,
                                 format!(
-                                    "[aptos_vm] Transaction breaking invariant violation. txn: {:?}, status: {:?}",
+                                    "[aptos_vm] Transaction breaking invariant violation: {:?}\ntxn: {:?}",
+                                    vm_status,
                                     bcs::to_bytes::<SignedTransaction>(txn),
-                                    vm_status
                                 ),
                             );
                         },
@@ -2836,9 +2836,9 @@ impl AptosVM {
                             {
                                 error!(
                                 *log_context,
-                                "[aptos_vm] Transaction breaking paranoid mode. txn: {:?}, status: {:?}",
-                                bcs::to_bytes::<SignedTransaction>(txn),
+                                "[aptos_vm] Transaction breaking paranoid mode: {:?}\ntxn: {:?}",
                                 vm_status,
+                                bcs::to_bytes::<SignedTransaction>(txn),
                             );
                             },
                         // Paranoid mode failure but with reference counting
@@ -2848,9 +2848,9 @@ impl AptosVM {
                             {
                                 error!(
                                 *log_context,
-                                "[aptos_vm] Transaction breaking paranoid mode. txn: {:?}, status: {:?}",
-                                bcs::to_bytes::<SignedTransaction>(txn),
+                                "[aptos_vm] Transaction breaking paranoid mode: {:?}\ntxn: {:?}",
                                 vm_status,
+                                bcs::to_bytes::<SignedTransaction>(txn),
                             );
                             },
                         // Paranoid mode failure but with reference safety checks
@@ -2873,9 +2873,9 @@ impl AptosVM {
                         _ => {
                             error!(
                                 *log_context,
-                                "[aptos_vm] Transaction breaking invariant violation. txn: {:?}, status: {:?}",
-                                bcs::to_bytes::<SignedTransaction>(txn),
+                                "[aptos_vm] Transaction breaking invariant violation: {:?}\ntxn: {:?}, ",
                                 vm_status,
+                                bcs::to_bytes::<SignedTransaction>(txn),
                             );
                         },
                     }

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

@@ -1,43 +1,43 @@
-Loop { loop_count: Some(100000), loop_type: NoOp }	6	0.994	1.022	38997.7
-Loop { loop_count: Some(10000), loop_type: Arithmetic }	6	0.997	1.028	23625.0
-CreateObjects { num_objects: 10, object_payload_size: 0 }	6	0.989	1.018	125.9
-CreateObjects { num_objects: 10, object_payload_size: 10240 }	6	0.997	1.005	8315.4
-CreateObjects { num_objects: 100, object_payload_size: 0 }	6	0.988	1.010	1185.0
-CreateObjects { num_objects: 100, object_payload_size: 10240 }	6	0.995	1.020	9858.5
-InitializeVectorPicture { length: 128 }	6	0.991	1.015	147.0
-VectorPicture { length: 128 }	6	0.989	1.031	33.3
-VectorPictureRead { length: 128 }	6	0.984	1.038	32.4
-InitializeVectorPicture { length: 30720 }	6	0.998	1.017	25053.1
-VectorPicture { length: 30720 }	6	0.989	1.018	4573.0
-VectorPictureRead { length: 30720 }	6	0.987	1.017	4581.7
-SmartTablePicture { length: 30720, num_points_per_txn: 200 }	6	0.997	1.012	31537.5
-SmartTablePicture { length: 1048576, num_points_per_txn: 300 }	6	0.998	1.067	55284.8
-ResourceGroupsSenderWriteTag { string_length: 1024 }	6	0.989	1.011	16.1
-ResourceGroupsSenderMultiChange { string_length: 1024 }	6	0.987	1.005	30.7
-TokenV1MintAndTransferFT	6	0.992	1.020	439.8
-TokenV1MintAndTransferNFTSequential	6	0.997	1.021	625.3
-TokenV2AmbassadorMint { numbered: true }	6	0.985	1.016	408.5
-LiquidityPoolSwap { is_stable: true }	6	0.987	1.012	623.0
-LiquidityPoolSwap { is_stable: false }	6	0.998	1.011	574.9
-CoinInitAndMint	6	0.982	1.013	625.3
-FungibleAssetMint	6	0.969	1.008	198.2
-IncGlobalMilestoneAggV2 { milestone_every: 1 }	6	0.993	1.012	27.8
-IncGlobalMilestoneAggV2 { milestone_every: 2 }	6	0.983	1.004	16.3
-EmitEvents { count: 1000 }	6	0.994	1.019	6726.6
-APTTransferWithPermissionedSigner	6	0.994	1.013	788.5
-APTTransferWithMasterSigner	6	0.994	1.017	83.0
-VectorTrimAppend { vec_len: 3000, element_len: 1, index: 0, repeats: 0 }	6	0.998	1.009	4660.5
-VectorTrimAppend { vec_len: 3000, element_len: 1, index: 100, repeats: 1000 }	6	0.995	1.061	21446.3
-VectorTrimAppend { vec_len: 3000, element_len: 1, index: 2990, repeats: 1000 }	6	0.994	1.007	12415.7
-VectorRemoveInsert { vec_len: 3000, element_len: 1, index: 100, repeats: 1000 }	6	0.995	1.008	19462.7
-VectorRemoveInsert { vec_len: 3000, element_len: 1, index: 2998, repeats: 1000 }	6	0.998	1.014	13261.8
-VectorRangeMove { vec_len: 3000, element_len: 1, index: 1000, move_len: 500, repeats: 1000 }	6	0.997	1.003	21836.7
-VectorTrimAppend { vec_len: 100, element_len: 100, index: 0, repeats: 0 }	6	0.985	1.011	246.9
-VectorTrimAppend { vec_len: 100, element_len: 100, index: 10, repeats: 1000 }	6	0.983	1.027	8481.4
-VectorRangeMove { vec_len: 100, element_len: 100, index: 50, move_len: 10, repeats: 1000 }	6	0.996	1.023	3996.1
-MapInsertRemove { len: 100, repeats: 100, map_type: OrderedMap }	6	0.986	1.004	9840.3
-MapInsertRemove { len: 100, repeats: 100, map_type: SimpleMap }	6	0.995	1.017	32347.9
-MapInsertRemove { len: 100, repeats: 100, map_type: BigOrderedMap { inner_max_degree: 4, leaf_max_degree: 4 } }	6	0.994	1.008	76269.3
-MapInsertRemove { len: 100, repeats: 100, map_type: BigOrderedMap { inner_max_degree: 1024, leaf_max_degree: 1024 } }	6	0.994	1.004	14760.4
-MapInsertRemove { len: 1000, repeats: 100, map_type: OrderedMap }	6	0.996	1.011	49048.5
-OrderBook { state: OrderBookState { order_idx: 0 }, num_markets: 1, overlap_ratio: 0.0, buy_frequency: 0.5, max_sell_size: 1, max_buy_size: 1 }	6	0.994	1.010	468.2
+Loop { loop_count: Some(100000), loop_type: NoOp }	3	0.999	1.006	34260.4
+Loop { loop_count: Some(10000), loop_type: Arithmetic }	3	0.999	1.003	21485.1
+CreateObjects { num_objects: 10, object_payload_size: 0 }	3	0.991	1.011	104.5
+CreateObjects { num_objects: 10, object_payload_size: 10240 }	3	0.987	1.002	7764.2
+CreateObjects { num_objects: 100, object_payload_size: 0 }	3	1.000	1.004	965.0
+CreateObjects { num_objects: 100, object_payload_size: 10240 }	3	0.990	1.003	9059.1
+InitializeVectorPicture { length: 128 }	3	0.988	1.003	138.1
+VectorPicture { length: 128 }	3	0.993	1.002	39.3
+VectorPictureRead { length: 128 }	3	0.988	1.217	32.6
+InitializeVectorPicture { length: 30720 }	3	0.986	1.001	23541.0
+VectorPicture { length: 30720 }	3	0.998	1.000	4486.4
+VectorPictureRead { length: 30720 }	3	0.999	1.004	4486.4
+SmartTablePicture { length: 30720, num_points_per_txn: 200 }	3	0.997	1.006	18783.0
+SmartTablePicture { length: 1048576, num_points_per_txn: 300 }	3	1.000	1.003	32998.0
+ResourceGroupsSenderWriteTag { string_length: 1024 }	3	0.977	1.003	16.0
+ResourceGroupsSenderMultiChange { string_length: 1024 }	3	0.993	1.000	29.8
+TokenV1MintAndTransferFT	3	0.990	1.007	358.8
+TokenV1MintAndTransferNFTSequential	3	0.994	1.014	503.4
+TokenV2AmbassadorMint { numbered: true }	3	0.998	1.012	315.6
+LiquidityPoolSwap { is_stable: true }	3	0.997	1.005	495.6
+LiquidityPoolSwap { is_stable: false }	3	0.989	1.002	460.4
+CoinInitAndMint	3	0.996	1.007	503.4
+FungibleAssetMint	3	0.998	1.029	160.4
+IncGlobalMilestoneAggV2 { milestone_every: 1 }	3	0.995	1.009	24.1
+IncGlobalMilestoneAggV2 { milestone_every: 2 }	3	0.968	1.010	14.5
+EmitEvents { count: 1000 }	3	0.998	1.011	5420.0
+APTTransferWithPermissionedSigner	3	0.991	1.002	553.3
+APTTransferWithMasterSigner	3	0.998	0.999	67.2
+VectorTrimAppend { vec_len: 3000, element_len: 1, index: 0, repeats: 0 }	3	0.994	1.032	4529.6
+VectorTrimAppend { vec_len: 3000, element_len: 1, index: 100, repeats: 1000 }	3	0.985	1.003	18889.3
+VectorTrimAppend { vec_len: 3000, element_len: 1, index: 2990, repeats: 1000 }	3	0.994	1.009	9462.4
+VectorRemoveInsert { vec_len: 3000, element_len: 1, index: 100, repeats: 1000 }	3	0.995	1.006	15009.6
+VectorRemoveInsert { vec_len: 3000, element_len: 1, index: 2998, repeats: 1000 }	3	0.997	1.004	10454.4
+VectorRangeMove { vec_len: 3000, element_len: 1, index: 1000, move_len: 500, repeats: 1000 }	3	0.992	1.004	21330.2
+VectorTrimAppend { vec_len: 100, element_len: 100, index: 0, repeats: 0 }	3	0.994	1.007	235.4
+VectorTrimAppend { vec_len: 100, element_len: 100, index: 10, repeats: 1000 }	3	0.990	1.009	5658.7
+VectorRangeMove { vec_len: 100, element_len: 100, index: 50, move_len: 10, repeats: 1000 }	3	0.993	1.005	3845.3
+MapInsertRemove { len: 100, repeats: 100, map_type: OrderedMap }	3	0.994	1.003	5689.1
+MapInsertRemove { len: 100, repeats: 100, map_type: SimpleMap }	3	0.992	1.005	18641.9
+MapInsertRemove { len: 100, repeats: 100, map_type: BigOrderedMap { inner_max_degree: 4, leaf_max_degree: 4 } }	3	0.997	1.004	33261.7
+MapInsertRemove { len: 100, repeats: 100, map_type: BigOrderedMap { inner_max_degree: 1024, leaf_max_degree: 1024 } }	3	0.999	1.008	7719.9
+MapInsertRemove { len: 1000, repeats: 100, map_type: OrderedMap }	3	0.993	1.001	29088.2
+OrderBook { state: OrderBookState { order_idx: 0 }, num_markets: 1, overlap_ratio: 0.0, buy_frequency: 0.5, max_sell_size: 1, max_buy_size: 1 }	3	0.996	1.011	399.2

aptos-move/e2e-benchmark/data/calibration_values.tsv

@@ -1,59 +1,50 @@
-no-op	1	VM	6	0.975	1.007	35206.7
-no-op-orderless	1	VM	1	0.7	1.3	35206.7
-no-op	1000	VM	6	0.982	1.022	32347.9
-apt-fa-transfer	1	VM	6	0.993	1.012	25008.6
-apt-fa-transfer	1	NativeVM	6	0.956	1.021	40094.5
-account-generation	1	VM	6	0.969	1.025	19826.7
-account-generation	1	NativeVM	6	0.982	1.007	34596.7
-account-resource32-b	1	VM	6	0.987	1.009	31782.9
-modify-global-resource	1	VM	6	0.984	1.018	2675.9
-modify-global-resource	100	VM	6	0.996	1.020	30646.3
-publish-package	1	VM	6	0.987	1.015	2208.9
-mix_publish_transfer	1	VM	6	0.992	1.041	21291.6
-batch100-transfer	1	VM	6	0.990	1.026	941.6
-batch100-transfer	1	NativeVM	6	0.983	1.050	1699.9
-vector-picture30k	1	VM	6	0.991	1.012	133.0
-vector-picture30k	100	VM	6	0.972	1.023	1828.1
-smart-table-picture30-k-with200-change	1	VM	6	0.976	1.009	20.1
-smart-table-picture30-k-with200-change	100	VM	6	0.989	1.041	233.7
-modify-global-resource-agg-v2	1	VM	6	0.989	1.011	32284.2
-modify-global-flag-agg-v2	1	VM	6	0.981	1.034	4141.2
-modify-global-bounded-agg-v2	1	VM	6	0.990	1.046	7312.3
-modify-global-milestone-agg-v2	1	VM	6	0.995	1.015	25776.8
-resource-groups-global-write-tag1-kb	1	VM	6	0.977	1.066	8039.4
-resource-groups-global-write-and-read-tag1-kb	1	VM	6	0.980	1.032	5980.3
-resource-groups-sender-write-tag1-kb	1	VM	6	0.941	1.018	19790.1
-resource-groups-sender-multi-change1-kb	1	VM	6	0.982	1.078	16433.3
-token-v1ft-mint-and-transfer	1	VM	6	0.993	1.010	1207.4
-token-v1ft-mint-and-transfer	100	VM	6	0.987	1.015	14358.6
-token-v1nft-mint-and-transfer-sequential	1	VM	6	0.993	1.011	812.7
-token-v1nft-mint-and-transfer-sequential	100	VM	6	0.996	1.020	10938.0
-coin-init-and-mint	1	VM	6	0.996	1.016	16466.1
-coin-init-and-mint	100	VM	6	0.964	1.017	13997.3
-fungible-asset-mint	1	VM	6	0.971	1.015	20719.3
-fungible-asset-mint	100	VM	6	0.990	1.010	18187.6
-no-op5-signers	1	VM	6	0.995	1.009	35548.1
-token-v2-ambassador-mint	1	VM	6	0.990	1.007	13846.2
-token-v2-ambassador-mint	100	VM	6	1.000	1.015	13623.4
-liquidity-pool-swap	1	VM	6	0.993	1.009	831.8
-liquidity-pool-swap	100	VM	6	0.985	1.017	9426.9
-liquidity-pool-swap-stable	1	VM	6	0.997	1.014	799.8
-liquidity-pool-swap-stable	100	VM	6	0.994	1.031	9163.3
-deserialize-u256	1	VM	6	0.998	1.019	33394.0
-no-op-fee-payer	1	VM	6	0.986	1.004	2317.1
-no-op-fee-payer	100	VM	6	0.986	1.017	27943.9
-simple-script	1	VM	6	0.991	1.012	35002.7
-vector-trim-append-len3000-size1	1	VM	6	0.974	1.012	812.7
-vector-remove-insert-len3000-size1	1	VM	6	0.986	1.013	939.9
-order-book-no-matches1-market	1	VM	6	0.963	1.029	1811.3
-order-book-balanced-matches25-pct1-market	1	VM	6	0.983	1.019	1117.3
-order-book-balanced-matches80-pct1-market	1	VM	6	0.986	1.034	601.4
-order-book-balanced-size-skewed80-pct1-market	1	VM	6	0.963	1.105	1278.5
-order-book-no-matches50-markets	1	VM	6	0.996	1.013	5429.7
-order-book-balanced-matches25-pct50-markets	1	VM	6	0.997	1.010	5709.5
-order-book-balanced-matches80-pct50-markets	1	VM	6	0.989	1.009	6341.8
-order-book-balanced-size-skewed80-pct50-markets	1	VM	6	0.972	1.020	5170.4
-no_commit_apt-fa-transfer	1	VM	6	0.978	1.017	26381.7
-no_commit_apt-fa-transfer	1	NativeVM	6	0.979	1.014	44067.9
-no_commit_apt-fa-transfer	1	AptosVMSpeculative	6	0.990	1.016	9462.4
-no_commit_apt-fa-transfer	1	NativeSpeculative	6	0.992	1.020	97922.8
+no-op	1	VM	3	0.988	1.007	37992.0
+no-op	1000	VM	3	1.000	1.026	34799.4
+apt-fa-transfer	1	VM	3	0.993	1.009	28822.5
+apt-fa-transfer	1	NativeVM	3	0.985	1.012	40390.5
+account-generation	1	VM	3	0.995	1.006	23207.8
+account-generation	1	NativeVM	3	0.916	1.052	40168.4
+account-resource32-b	1	VM	3	0.990	1.006	34529.3
+modify-global-resource	1	VM	3	0.989	1.011	2953.1
+modify-global-resource	100	VM	3	0.995	1.006	33792.4
+publish-package	1	VM	3	0.992	1.021	2251.8
+mix_publish_transfer	1	VM	3	0.990	1.007	24480.7
+batch100-transfer	1	VM	3	0.996	1.048	1193.9
+batch100-transfer	1	NativeVM	3	0.973	1.011	1841.6
+vector-picture30k	1	VM	3	0.997	1.010	136.2
+vector-picture30k	100	VM	3	0.989	1.046	1851.9
+smart-table-picture30-k-with200-change	1	VM	3	0.995	1.008	31.0
+smart-table-picture30-k-with200-change	100	VM	3	0.985	1.015	369.8
+modify-global-resource-agg-v2	1	VM	3	0.978	1.010	34394.7
+modify-global-flag-agg-v2	1	VM	3	0.984	1.023	4731.2
+modify-global-bounded-agg-v2	1	VM	3	0.980	1.006	8348.5
+modify-global-milestone-agg-v2	1	VM	3	0.994	1.007	28404.4
+resource-groups-global-write-tag1-kb	1	VM	3	0.994	1.012	8464.8
+resource-groups-global-write-and-read-tag1-kb	1	VM	3	0.997	1.000	6548.5
+resource-groups-sender-write-tag1-kb	1	VM	3	0.981	1.020	19535.1
+resource-groups-sender-multi-change1-kb	1	VM	3	0.979	1.029	16564.9
+token-v1ft-mint-and-transfer	1	VM	3	0.995	1.009	1389.5
+token-v1ft-mint-and-transfer	100	VM	3	0.997	0.999	16110.4
+token-v1nft-mint-and-transfer-sequential	1	VM	3	0.995	1.006	970.5
+token-v1nft-mint-and-transfer-sequential	100	VM	3	0.993	1.013	12774.1
+coin-init-and-mint	1	VM	3	0.997	1.004	19426.5
+coin-init-and-mint	100	VM	3	0.990	1.003	17063.2
+fungible-asset-mint	1	VM	3	0.978	1.002	23042.7
+fungible-asset-mint	100	VM	3	0.997	1.009	20493.5
+no-op5-signers	1	VM	3	0.998	1.010	37992.0
+token-v2-ambassador-mint	1	VM	3	0.991	1.010	15829.9
+token-v2-ambassador-mint	100	VM	3	0.992	1.019	15498.8
+liquidity-pool-swap	1	VM	3	0.996	1.008	966.8
+liquidity-pool-swap	100	VM	3	0.990	1.002	11076.5
+liquidity-pool-swap-stable	1	VM	3	0.999	1.005	927.7
+liquidity-pool-swap-stable	100	VM	3	0.989	1.003	10761.9
+deserialize-u256	1	VM	3	0.998	1.003	36932.7
+no-op-fee-payer	1	VM	3	0.997	1.001	2604.1
+no-op-fee-payer	100	VM	3	0.998	1.012	28875.4
+simple-script	1	VM	3	0.983	1.002	38492.8
+vector-trim-append-len3000-size1	1	VM	3	0.978	1.012	902.4
+vector-remove-insert-len3000-size1	1	VM	3	0.991	1.012	1070.6
+order-book-no-matches50-markets	1	VM	3	0.995	1.004	5011.8
+order-book-balanced-matches25-pct50-markets	1	VM	3	0.992	1.000	5410.2
+order-book-balanced-matches80-pct50-markets	1	VM	3	0.988	1.019	6196.8
+order-book-balanced-size-skewed80-pct50-markets	1	VM	3	0.994	1.044	5361.6

testsuite/single_node_performance_values.tsv

@@ -19,6 +19,7 @@ claims = { workspace = true }
 fail = { workspace = true }
 fxhash = { workspace = true }
 hashbrown = { workspace = true }
+itertools = { workspace = true }
 lazy_static = { workspace = true }
 lru = { workspace = true }
 move-binary-format = { workspace = true }
@@ -38,7 +39,7 @@ hex = { workspace = true }
 legacy-move-compiler = { workspace = true }
 move-binary-format = { workspace = true, features = ["fuzzing"] }
 move-ir-compiler = { workspace = true }
-move-vm-test-utils ={ workspace = true }
+move-vm-test-utils = { workspace = true }
 move-vm-types = { workspace = true, features = ["testing"] }
 proptest = { workspace = true }
 smallbitvec = { workspace = true }

third_party/move/move-vm/runtime/Cargo.toml

@@ -16,7 +16,9 @@ pub struct VMConfig {
     pub verifier_config: VerifierConfig,
     pub deserializer_config: DeserializerConfig,
     /// When this flag is set to true, MoveVM will perform type checks at every instruction
-    /// execution to ensure that type safety cannot be violated at runtime.
+    /// execution to ensure that type safety cannot be violated at runtime. Note: these
+    /// are more than type checks, for example, stack balancing, visibility, but the name
+    /// is kept for historical reasons.
     pub paranoid_type_checks: bool,
     pub check_invariant_in_swap_loc: bool,
     /// Maximum value nest depth for structs.
@@ -34,6 +36,9 @@ pub struct VMConfig {
     pub use_call_tree_and_instruction_cache: bool,
     pub enable_lazy_loading: bool,
     pub enable_depth_checks: bool,
+    /// Whether trusted code should be optimized, for example, excluding it from expensive
+    /// paranoid checks.
+    pub optimize_trusted_code: bool,
     /// When this flag is set to true, Move VM will perform additional checks to ensure that
     /// reference safety is maintained during execution.
     pub paranoid_ref_checks: bool,
@@ -57,6 +62,7 @@ impl Default for VMConfig {
             use_call_tree_and_instruction_cache: true,
             enable_lazy_loading: true,
             enable_depth_checks: true,
+            optimize_trusted_code: false,
             paranoid_ref_checks: false,
         }
     }

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

@@ -47,7 +47,7 @@ pub(crate) struct Frame {
     call_type: CallType,
     // Locals for this execution context and their instantiated types.
     pub(crate) locals: Locals,
-    local_tys: Vec<Type>,
+    pub(crate) local_tys: Vec<Type>,
     // Cache of types accessed in this frame, to improve performance when accessing
     // and constructing types.
     pub(crate) frame_cache: Rc<RefCell<FrameTypeCache>>,
@@ -146,7 +146,7 @@ impl Frame {
         }
 
         let ty_builder = vm_config.ty_builder.clone();
-        let local_tys = if RTTCheck::should_perform_checks() {
+        let local_tys = if RTTCheck::should_perform_checks(&function.function) {
             if ty_args.is_empty() {
                 function.local_tys().to_vec()
             } else {
@@ -192,6 +192,11 @@ impl Frame {
         Ok(())
     }
 
+    #[inline(always)]
+    pub(crate) fn untrusted_code(&self) -> bool {
+        !self.function.function.is_trusted
+    }
+
     pub(crate) fn constant_at(&self, idx: ConstantPoolIndex) -> &Constant {
         use LoadedFunctionOwner::*;
         match self.function.owner() {