From 7a9f3e0adc11eb3ce6fde0965c422507f06a0989 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 23 Jun 2022 15:02:10 +0000 Subject: [PATCH] Remove auto traits from ICE work-around (#26098) (#26174) (cherry picked from commit 7d29c263156e6220f6db87e8d89f826a351dc2dd) Co-authored-by: Brooks Prumo --- runtime/src/builtins.rs | 62 +++++++++++------------------------------ sdk/src/lib.rs | 8 ------ 2 files changed, 17 insertions(+), 53 deletions(-) diff --git a/runtime/src/builtins.rs b/runtime/src/builtins.rs index ee65d1777ba8a0..9071bc78e68797 100644 --- a/runtime/src/builtins.rs +++ b/runtime/src/builtins.rs @@ -1,8 +1,5 @@ #[cfg(RUSTC_WITH_SPECIALIZATION)] use solana_frozen_abi::abi_example::AbiExample; -#[cfg(debug_assertions)] -#[allow(deprecated)] -use solana_sdk::AutoTraitBreakSendSync; use { crate::system_instruction_processor, solana_program_runtime::invoke_context::{InvokeContext, ProcessInstructionWithContext}, @@ -69,7 +66,7 @@ pub enum BuiltinAction { /// State transition enum used for adding and removing builtin programs through /// feature activations. #[derive(Debug, Clone, AbiExample)] -enum InnerBuiltinFeatureTransition { +pub enum BuiltinFeatureTransition { /// Add a builtin program if a feature is activated. Add { builtin: Builtin, @@ -84,40 +81,15 @@ enum InnerBuiltinFeatureTransition { }, } -#[allow(deprecated)] -#[cfg(debug_assertions)] -impl AutoTraitBreakSendSync for InnerBuiltinFeatureTransition {} - -#[derive(AbiExample, Clone, Debug)] -pub struct BuiltinFeatureTransition(InnerBuiltinFeatureTransition); - -// https://github.com/solana-labs/solana/pull/23233 added `BuiltinFeatureTransition` -// to `Bank` which triggers https://github.com/rust-lang/rust/issues/92987 while -// attempting to resolve `Sync` on `BankRc` in `AccountsBackgroundService::new` ala, -// -// query stack during panic: -// #0 [evaluate_obligation] evaluating trait selection obligation `bank::BankRc: core::marker::Sync` -// #1 [typeck] type-checking `accounts_background_service::::new` -// #2 [typeck_item_bodies] type-checking all item bodies -// #3 [analysis] running analysis passes on this crate -// end of query stack -// -// Yoloing a `Sync` onto it avoids the auto trait evaluation and thus the ICE. -// -// We should remove this when upgrading to Rust 1.60.0, where the bug has been -// fixed by https://github.com/rust-lang/rust/pull/93064 -unsafe impl Send for BuiltinFeatureTransition {} -unsafe impl Sync for BuiltinFeatureTransition {} - impl BuiltinFeatureTransition { pub fn to_action( &self, should_apply_action_for_feature: &impl Fn(&Pubkey) -> bool, ) -> Option { - match &self.0 { - InnerBuiltinFeatureTransition::Add { + match self { + Self::Add { builtin, - ref feature_id, + feature_id, } => { if should_apply_action_for_feature(feature_id) { Some(BuiltinAction::Add(builtin.clone())) @@ -125,10 +97,10 @@ impl BuiltinFeatureTransition { None } } - InnerBuiltinFeatureTransition::RemoveOrRetain { + Self::RemoveOrRetain { previously_added_builtin, - ref addition_feature_id, - ref removal_feature_id, + addition_feature_id, + removal_feature_id, } => { if should_apply_action_for_feature(removal_feature_id) { Some(BuiltinAction::Remove(previously_added_builtin.id)) @@ -181,15 +153,15 @@ fn dummy_process_instruction( /// Dynamic feature transitions for builtin programs fn builtin_feature_transitions() -> Vec { vec![ - BuiltinFeatureTransition(InnerBuiltinFeatureTransition::Add { + BuiltinFeatureTransition::Add { builtin: Builtin::new( "compute_budget_program", solana_sdk::compute_budget::id(), solana_compute_budget_program::process_instruction, ), feature_id: feature_set::add_compute_budget_program::id(), - }), - BuiltinFeatureTransition(InnerBuiltinFeatureTransition::RemoveOrRetain { + }, + BuiltinFeatureTransition::RemoveOrRetain { previously_added_builtin: Builtin::new( "secp256k1_program", solana_sdk::secp256k1_program::id(), @@ -197,8 +169,8 @@ fn builtin_feature_transitions() -> Vec { ), addition_feature_id: feature_set::secp256k1_program_enabled::id(), removal_feature_id: feature_set::prevent_calling_precompiles_as_programs::id(), - }), - BuiltinFeatureTransition(InnerBuiltinFeatureTransition::RemoveOrRetain { + }, + BuiltinFeatureTransition::RemoveOrRetain { previously_added_builtin: Builtin::new( "ed25519_program", solana_sdk::ed25519_program::id(), @@ -206,23 +178,23 @@ fn builtin_feature_transitions() -> Vec { ), addition_feature_id: feature_set::ed25519_program_enabled::id(), removal_feature_id: feature_set::prevent_calling_precompiles_as_programs::id(), - }), - BuiltinFeatureTransition(InnerBuiltinFeatureTransition::Add { + }, + BuiltinFeatureTransition::Add { builtin: Builtin::new( "address_lookup_table_program", solana_address_lookup_table_program::id(), solana_address_lookup_table_program::processor::process_instruction, ), feature_id: feature_set::versioned_tx_message_enabled::id(), - }), - BuiltinFeatureTransition(InnerBuiltinFeatureTransition::Add { + }, + BuiltinFeatureTransition::Add { builtin: Builtin::new( "zk_token_proof_program", solana_zk_token_sdk::zk_token_proof_program::id(), solana_zk_token_proof_program::process_instruction, ), feature_id: feature_set::zk_token_sdk_enabled::id(), - }), + }, ] } diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs index 019cd40ed149d6..bc3c65dcbd289a 100644 --- a/sdk/src/lib.rs +++ b/sdk/src/lib.rs @@ -97,14 +97,6 @@ pub use solana_sdk_macro::pubkeys; #[rustversion::since(1.46.0)] pub use solana_sdk_macro::respan; -#[deprecated( - since = "1.9.0", - note = "use only to break https://github.com/rust-lang/rust/issues/92987. remove when we move to Rust 1.60.0" -)] -#[doc(hidden)] -#[cfg(debug_assertions)] -pub trait AutoTraitBreakSendSync: Send + Sync {} - // Unused `solana_sdk::program_stubs!()` macro retained for source backwards compatibility with older programs #[macro_export] #[deprecated(