Use SWIFT_DEFER

Author: valeriyvan

lib/DependencyScan/ScanDependencies.cpp

@@ -1058,6 +1058,10 @@ forEachBatchEntry(CompilerInstance &invocationInstance,
     subInstanceMap = new CompilerArgInstanceCacheMap;
     localSubInstanceMap = true;
   }
+  SWIFT_DEFER {
+    if (localSubInstanceMap)
+      delete subInstanceMap;
+  };
 
   auto &diags = invocationInstance.getDiags();
   ForwardingDiagnosticConsumer FDC(invocationInstance.getDiags());
@@ -1094,16 +1098,12 @@ forEachBatchEntry(CompilerInstance &invocationInstance,
       if (subInvoke.parseArgs(args, diags)) {
         invocationInstance.getDiags().diagnose(
             SourceLoc(), diag::scanner_arguments_invalid, entry.arguments);
-        if (localSubInstanceMap)
-          delete subInstanceMap;
         return true;
       }
       std::string InstanceSetupError;
       if (newInstance->setup(subInvoke, InstanceSetupError)) {
         invocationInstance.getDiags().diagnose(
             SourceLoc(), diag::scanner_arguments_invalid, entry.arguments);
-        if (localSubInstanceMap)
-          delete subInstanceMap;
         return true;
       }
       auto mainModuleName = newInstance->getMainModule()->getNameStr();
@@ -1122,8 +1122,6 @@ forEachBatchEntry(CompilerInstance &invocationInstance,
     scanningAction(entry, *pInstance, *pCache);
   }
 
-  if (localSubInstanceMap)
-    delete subInstanceMap;
   return false;
 }