[Comgr] Fix memory leak in name expression API (llvm#4116)

Salinas, David · web-flow · commit 9cd4d5f88694 · 2025-09-18T12:51:04.000-04:00
diff --git a/amd/comgr/src/comgr.cpp b/amd/comgr/src/comgr.cpp
@@ -2111,6 +2111,8 @@ amd_comgr_populate_name_expression_map(amd_comgr_data_t Data, size_t *Count) {
     if (!RelaRangeOrError) {
       llvm::logAllUnhandledErrors(RelaRangeOrError.takeError(), llvm::errs(),
                                   "RelaRange creation error: ");
+      for (auto *Ptr : NameExpDataVec)
+        delete Ptr;
       return AMD_COMGR_STATUS_ERROR;
     }
     auto RelaRange = std::move(RelaRangeOrError.get());
@@ -2131,6 +2133,8 @@ amd_comgr_populate_name_expression_map(amd_comgr_data_t Data, size_t *Count) {
     if (!RodataOrError) {
       llvm::logAllUnhandledErrors(RodataOrError.takeError(), llvm::errs(),
                                   "Rodata creation error: ");
+      for (auto *Ptr : NameExpDataVec)
+        delete Ptr;
       return AMD_COMGR_STATUS_ERROR;
     }
     auto Rodata = std::move(RodataOrError.get());
@@ -2161,6 +2165,8 @@ amd_comgr_populate_name_expression_map(amd_comgr_data_t Data, size_t *Count) {
       }
     }
 
+    for (auto *Ptr : NameExpDataVec)
+      delete Ptr;
   } // end AMD_COMGR_DATA_KIND_EXECUTABLE conditional
 
   *Count = DataP->NameExpressionMap.size();

Original file line number	Diff line number	Diff line change
`@@ -2111,6 +2111,8 @@ amd_comgr_populate_name_expression_map(amd_comgr_data_t Data, size_t *Count) {`
`2111`	`2111`	`if (!RelaRangeOrError) {`
`2112`	`2112`	`llvm::logAllUnhandledErrors(RelaRangeOrError.takeError(), llvm::errs(),`
`2113`	`2113`	`"RelaRange creation error: ");`
	`2114`	`+ for (auto *Ptr : NameExpDataVec)`
	`2115`	`+ delete Ptr;`
`2114`	`2116`	`return AMD_COMGR_STATUS_ERROR;`
`2115`	`2117`	`}`
`2116`	`2118`	`auto RelaRange = std::move(RelaRangeOrError.get());`
`@@ -2131,6 +2133,8 @@ amd_comgr_populate_name_expression_map(amd_comgr_data_t Data, size_t *Count) {`
`2131`	`2133`	`if (!RodataOrError) {`
`2132`	`2134`	`llvm::logAllUnhandledErrors(RodataOrError.takeError(), llvm::errs(),`
`2133`	`2135`	`"Rodata creation error: ");`
	`2136`	`+ for (auto *Ptr : NameExpDataVec)`
	`2137`	`+ delete Ptr;`
`2134`	`2138`	`return AMD_COMGR_STATUS_ERROR;`
`2135`	`2139`	`}`
`2136`	`2140`	`auto Rodata = std::move(RodataOrError.get());`
`@@ -2161,6 +2165,8 @@ amd_comgr_populate_name_expression_map(amd_comgr_data_t Data, size_t *Count) {`
`2161`	`2165`	`}`
`2162`	`2166`	`}`
`2163`	`2167`
	`2168`	`+ for (auto *Ptr : NameExpDataVec)`
	`2169`	`+ delete Ptr;`
`2164`	`2170`	`} // end AMD_COMGR_DATA_KIND_EXECUTABLE conditional`
`2165`	`2171`
`2166`	`2172`	`*Count = DataP->NameExpressionMap.size();`