commit 09d8a6e30264df37071fe1beadf96813463db9a7
author Stephen Hines <srhines@google.com> Wed Jul 01 21:07:03 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 01 21:07:04 2015 +0000
tree da977307fc856dc2d72be33aa578adbb66306bc9
parent 52d18b452f54073e45070182ea8a25aae748b5ab
parent 3f45a25c23fa0f2cca4070f4d8713dc1a83f5ff7

Merge "slang: Improve handling of StringMapEntries."

slang.cpp

diff --git a/slang.cpp b/slang.cpp
index da9b2eb..ec068d3 100644
--- a/slang.cpp
+++ b/slang.cpp
@@ -534,8 +534,9 @@
           llvm::StringMapEntry<ReflectedDefinitionTy>::Create(RDKey);
       ME->setValue(std::make_pair(ERT, CurInputFile));
 
-      if (!ReflectedDefinitions.insert(ME))
-        delete ME;
+      if (!ReflectedDefinitions.insert(ME)) {
+        slangAssert(false && "Type shouldn't be in map yet!");
+      }
 
       // Take the ownership of ERT such that it won't be freed in ~RSContext().
       ERT->keep();

slang_rs_context.cpp

diff --git a/slang_rs_context.cpp b/slang_rs_context.cpp
index 08d804b..2c4c6c6 100644
--- a/slang_rs_context.cpp
+++ b/slang_rs_context.cpp
@@ -259,7 +259,7 @@
   if (mExportTypes.insert(NewItem)) {
     return true;
   } else {
-    free(NewItem);
+    NewItem->Destroy(mExportTypes.getAllocator());
     return false;
   }
 }