Handle closing of the program in the same slot as deployment (#33025)

solana-labs · Aug 28, 2023 · e036a03 · e036a03
1 parent f4dcb20
commit e036a03
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/program-runtime/src/loaded_programs.rs b/program-runtime/src/loaded_programs.rs
@@ -467,9 +467,11 @@ impl LoadedPrograms {
                         Ordering::Relaxed,
                     );
                     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.
+                } else if existing.is_tombstone() != entry.is_tombstone() {
+                    // Either the old entry is tombstone and the new one is not.
+                    // (Let's give the new entry a chance).
+                    // Or, the old entry is not a tombstone and the new one is a tombstone.
+                    // (Remove the old entry, as the tombstone makes it obsolete).
                     second_level.remove(entry_index);
                 } else {
                     self.stats.replacements.fetch_add(1, Ordering::Relaxed);