Merge pull request #62728 from valeriyvan/ScanDependencies-leak

swift-ci · web-flow · commit eb2c0a7636ca · 2023-01-13T11:14:48.000-08:00
Fix memory leak
diff --git a/lib/DependencyScan/ScanDependencies.cpp b/lib/DependencyScan/ScanDependencies.cpp
@@ -1057,6 +1057,10 @@ forEachBatchEntry(CompilerInstance &invocationInstance,
     subInstanceMap = new CompilerArgInstanceCacheMap;
     localSubInstanceMap = true;
   }
+  SWIFT_DEFER {
+    if (localSubInstanceMap)
+      delete subInstanceMap;
+  };
 
   auto &diags = invocationInstance.getDiags();
   ForwardingDiagnosticConsumer FDC(invocationInstance.getDiags());
@@ -1117,8 +1121,6 @@ forEachBatchEntry(CompilerInstance &invocationInstance,
     scanningAction(entry, *pInstance, *pCache);
   }
 
-  if (localSubInstanceMap)
-    delete subInstanceMap;
   return false;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1057,6 +1057,10 @@ forEachBatchEntry(CompilerInstance &invocationInstance,`
`1057`	`1057`	`subInstanceMap = new CompilerArgInstanceCacheMap;`
`1058`	`1058`	`localSubInstanceMap = true;`
`1059`	`1059`	`}`
	`1060`	`+ SWIFT_DEFER {`
	`1061`	`+ if (localSubInstanceMap)`
	`1062`	`+ delete subInstanceMap;`
	`1063`	`+ };`
`1060`	`1064`
`1061`	`1065`	`auto &diags = invocationInstance.getDiags();`
`1062`	`1066`	`ForwardingDiagnosticConsumer FDC(invocationInstance.getDiags());`
`@@ -1117,8 +1121,6 @@ forEachBatchEntry(CompilerInstance &invocationInstance,`
`1117`	`1121`	`scanningAction(entry, pInstance, pCache);`
`1118`	`1122`	`}`
`1119`	`1123`
`1120`		`- if (localSubInstanceMap)`
`1121`		`- delete subInstanceMap;`
`1122`	`1124`	`return false;`
`1123`	`1125`	`}`
`1124`	`1126`