rebase fixes

Author: HaoranYi

svm/src/account_loader.rs

@@ -1137,7 +1137,6 @@ mod tests {
         let fee_payer_rent_debit = 42;
 
         let mut error_metrics = TransactionErrorMetrics::default();
-        let loaded_programs = ProgramCacheForTxBatch::default();
 
         let sanitized_transaction = SanitizedTransaction::new_for_tests(
             sanitized_message,
@@ -1156,7 +1155,8 @@ mod tests {
             None,
             &FeatureSet::default(),
             &RentCollector::default(),
-            &loaded_programs,
+            &[],
+            &mut HashMap::default(),
         );
 
         let expected_rent_debits = {

svm/src/program_loader.rs

@@ -11,7 +11,7 @@ use {
         account::{AccountSharedData, ReadableAccount},
         account_utils::StateMut,
         bpf_loader, bpf_loader_deprecated,
-        bpf_loader_upgradeable::UpgradeableLoaderState,
+        bpf_loader_upgradeable::{self, UpgradeableLoaderState},
         clock::Slot,
         instruction::InstructionError,
         loader_v4::{self, LoaderV4State, LoaderV4Status},