From abf3914721c58783cdb8cb1f5cb02390a3d4d4d0 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 17:55:00 +0200 Subject: [PATCH] v1.16: Fix - Reordering in second level index of LoadedPrograms (backport of #32973) (#32977) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix - Reordering in second level index of LoadedPrograms (#32973) Replaces "swap_remove" => "remove". (cherry picked from commit 3bd14cc1e10fb0a5f06b152797c34bb9816a6ebd) Co-authored-by: Alexander Meißner --- program-runtime/src/loaded_programs.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/program-runtime/src/loaded_programs.rs b/program-runtime/src/loaded_programs.rs index f56030b14e19f0..846482a7ed33ca 100644 --- a/program-runtime/src/loaded_programs.rs +++ b/program-runtime/src/loaded_programs.rs @@ -457,11 +457,11 @@ impl LoadedPrograms { existing.ix_usage_counter.load(Ordering::Relaxed), Ordering::Relaxed, ); - second_level.swap_remove(entry_index); + second_level.remove(entry_index); } else if existing.is_tombstone() && !entry.is_tombstone() { // The old entry is tombstone and the new one is not. Let's give the new entry // a chance. - second_level.swap_remove(entry_index); + second_level.remove(entry_index); } else { self.stats.replacements.fetch_add(1, Ordering::Relaxed); return (true, existing.clone());