commit a41ce1d98094da84643995d40d71c529905123fc
author Zonr Chang <zonr@google.com> Wed Oct 06 02:23:12 2010 +0800
committer Shih-wei Liao <sliao@google.com> Wed Oct 06 03:47:22 2010 -0700
tree 5649228031e87169dbf566246686aa6c0db3974f
parent 6b6320ad5faee29e0f75fe937e40156746ef9e80

Fix memory leak of RSExport* object create in processExport(). Now, they will
properly be freed after their associated RSContext was destroyed.

slang_rs_context.h

diff --git a/slang_rs_context.h b/slang_rs_context.h
index 7e95d56..19f81ef 100644
--- a/slang_rs_context.h
+++ b/slang_rs_context.h
@@ -11,8 +11,6 @@
 
 #include "clang/Lex/Preprocessor.h"
 
-#include "slang_rs_export_element.h"
-
 namespace llvm {
   class LLVMContext;
   class TargetData;
@@ -27,10 +25,10 @@
 }   // namespace clang
 
 namespace slang {
-
-class RSExportVar;
-class RSExportFunc;
-class RSExportType;
+  class RSExportable;
+  class RSExportVar;
+  class RSExportFunc;
+  class RSExportType;
 
 class RSContext {
   typedef llvm::StringSet<> NeedExportVarSet;
@@ -38,6 +36,7 @@
   typedef llvm::StringSet<> NeedExportTypeSet;
 
  public:
+  typedef std::list<RSExportable*> ExportableList;
   typedef std::list<RSExportVar*> ExportVarList;
   typedef std::list<RSExportFunc*> ExportFuncList;
   typedef llvm::StringMap<RSExportType*> ExportTypeMap;
@@ -50,6 +49,8 @@
   llvm::TargetData *mTargetData;
   llvm::LLVMContext &mLLVMContext;
 
+  ExportableList mExportables;
+
   // Record the variables/types/elements annotated in #pragma to be exported
   NeedExportVarSet mNeedExportVars;
   NeedExportFuncSet mNeedExportFuncs;
@@ -119,6 +120,10 @@
   }
 
   void processExport();
+  inline void newExportable(RSExportable *E) {
+    if (E != NULL)
+      mExportables.push_back(E);
+  }
 
   typedef ExportVarList::const_iterator const_export_var_iterator;
   const_export_var_iterator export_vars_begin() const {