Merge pull request #20155 from bcoles/msf-payloadset-recalculate

Msf::PayloadSet#recalculate: Replace delete_if with replace(slice(...))

Author: dledda-r7

lib/msf/core/payload_set.rb

@@ -66,7 +66,6 @@ def each_module_filter(opts, name, mod)
   # of singles, stagers, and stages.
   #
   def recalculate
-    old_keys = self.keys
     new_keys = []
 
     # Recalculate single payloads
@@ -119,9 +118,7 @@ def recalculate
 
     # Blow away anything that was cached but didn't exist during the
     # recalculation
-    self.delete_if do |k, _v|
-      !!(old_keys.include?(k) and not new_keys.include?(k))
-    end
+    replace(slice(*new_keys))
 
     flush_blob_cache
   end