Fix memory leaks in addCapability and addConditionalCapability

Compiling with -fsantize=address uncovered 2 memory leaks. Instead of
handling memory manually, we could use std::unique_ptr to free the
memory for us.

Author: jmmartinez

lib/SPIRV/libSPIRV/SPIRVFnVar.cpp

@@ -169,7 +169,7 @@ bool specializeFnVariants(SPIRVModule *BM, std::string &ErrMsg) {
   for (const auto &CondCap : BM->getConditionalCapabilities()) {
     const SPIRVId Condition = CondCap.first.first;
     const Capability Cap = CondCap.first.second;
-    const SPIRVConditionalCapabilityINTEL *Entry = CondCap.second;
+    const SPIRVConditionalCapabilityINTEL *Entry = CondCap.second.get();
     bool ShouldKeep = false;
     if (!evaluateConstant(BM, Entry->getCondition(), ShouldKeep, ErrMsg)) {
       return false;

lib/SPIRV/libSPIRV/SPIRVModule.cpp

@@ -663,12 +663,6 @@ SPIRVModuleImpl::~SPIRVModuleImpl() {
   for (auto I : IdEntryMap)
     delete I.second;
 
-  for (auto C : CapMap)
-    delete C.second;
-
-  for (auto C : ConditionalCapMap)
-    delete C.second;
-
   for (auto *M : ModuleProcessedVec)
     delete M;
 }
@@ -787,10 +781,12 @@ void SPIRVModuleImpl::addCapability(SPIRVCapabilityKind Cap) {
   addCapabilities(SPIRV::getCapability(Cap));
   SPIRVDBG(spvdbgs() << "addCapability: " << SPIRVCapabilityNameMap::map(Cap)
                      << '\n');
-  if (hasCapability(Cap))
+
+  auto [It, Inserted] = CapMap.insert(std::make_pair(Cap, nullptr));
+  if (!Inserted)
     return;
 
-  auto *CapObj = new SPIRVCapability(this, Cap);
+  auto CapObj = std::make_unique<SPIRVCapability>(this, Cap);
   if (AutoAddExtensions) {
     // While we are reading existing SPIR-V we need to read it as-is and don't
     // add required extensions for each entry automatically
@@ -799,7 +795,7 @@ void SPIRVModuleImpl::addCapability(SPIRVCapabilityKind Cap) {
       addExtension(Ext.value());
   }
 
-  CapMap.insert(std::make_pair(Cap, CapObj));
+  It->second = std::move(CapObj);
 }
 
 void SPIRVModuleImpl::addCapabilityInternal(SPIRVCapabilityKind Cap) {
@@ -816,18 +812,19 @@ void SPIRVModuleImpl::addConditionalCapability(SPIRVId Condition,
   SPIRVDBG(spvdbgs() << "addConditionalCapability: "
                      << SPIRVCapabilityNameMap::map(Cap)
                      << ", condition: " << Condition << '\n');
-  if (ConditionalCapMap.find(std::make_pair(Condition, Cap)) !=
-      ConditionalCapMap.end()) {
+  auto Key = std::make_pair(Condition, Cap);
+  auto [It, Inserted] = ConditionalCapMap.insert({Key, nullptr});
+  if (!Inserted) {
     return;
   }
 
-  auto *CapObj = new SPIRVConditionalCapabilityINTEL(this, Condition, Cap);
+  auto CapObj =
+      std::make_unique<SPIRVConditionalCapabilityINTEL>(this, Condition, Cap);
   if (AutoAddExtensions) {
     assert(false && "Auto adding conditional extensions is not supported.");
   }
 
-  ConditionalCapMap.insert(
-      std::make_pair(std::make_pair(Condition, Cap), CapObj));
+  It->second = std::move(CapObj);
 }
 
 void SPIRVModuleImpl::eraseConditionalCapability(SPIRVId Condition,

lib/SPIRV/libSPIRV/SPIRVModule.h

@@ -109,9 +109,10 @@ struct SPIRVTypeImageDescriptor;
 
 class SPIRVModule {
 public:
-  typedef std::map<SPIRVCapabilityKind, SPIRVCapability *> SPIRVCapMap;
+  typedef std::map<SPIRVCapabilityKind, std::unique_ptr<SPIRVCapability>>
+      SPIRVCapMap;
   typedef std::map<std::pair<SPIRVId, SPIRVCapabilityKind>,
-                   SPIRVConditionalCapabilityINTEL *>
+                   std::unique_ptr<SPIRVConditionalCapabilityINTEL>>
       SPIRVConditionalCapMap;
   typedef std::vector<SPIRVConditionalEntryPointINTEL *>
       SPIRVConditionalEntryPointVec;