Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixes after rebase
Browse files Browse the repository at this point in the history
pgarg66 committed Aug 16, 2023
1 parent 0eda0e7 commit ddf2e50
Showing 3 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion program-runtime/src/loaded_programs.rs
Original file line number Diff line number Diff line change
@@ -650,7 +650,12 @@ impl LoadedPrograms {
}

if let LoadedProgramType::Unloaded(environment) = &entry.program {
if Arc::ptr_eq(environment, &self.program_runtime_environment_v1) {
if Arc::ptr_eq(environment, &self.environments.program_runtime_v1)
|| Arc::ptr_eq(
environment,
&self.environments.program_runtime_v2,
)
{
// if the environment hasn't changed since the entry was unloaded.
unloaded.push((key, count));
} else {
1 change: 1 addition & 0 deletions programs/loader-v4/src/lib.rs
Original file line number Diff line number Diff line change
@@ -450,6 +450,7 @@ pub fn process_instruction_deploy(
programdata,
buffer.get_data().len(),
&mut load_program_metrics,
false,
)
.map_err(|err| {
ic_logger_msg!(log_collector, "{}", err);
1 change: 0 additions & 1 deletion runtime/src/bank.rs
Original file line number Diff line number Diff line change
@@ -4642,7 +4642,6 @@ impl Bank {
}

pub fn load_program(&self, pubkey: &Pubkey, reload: bool) -> Arc<LoadedProgram> {
let program_runtime_environment_v1 = self
let environments = self
.loaded_programs_cache
.read()

0 comments on commit ddf2e50

Please sign in to comment.