commit b3a12fe7c18a06f99201dc491a932a90ab7d975c
author Stephen Hines <srhines@google.com> Wed Jan 26 20:16:38 2011 -0800
committer Stephen Hines <srhines@google.com> Thu Jan 27 17:04:09 2011 -0800
tree ab8f4cb4b11d83223f5606af50b936a04d1a6d19
parent c202d2d64fe0172bcc3999b515a14d3d88532420

Add Slang support for rs_object_slots metadata.

This is added to support proper cleanup of RS resources. We were leaking some
global resources because there was no way to tell which slots to clear.

Change-Id: Ib452facb1b83d1f2aecd9686f46ef726e427161d
b: 3381615

slang_rs_backend.cpp

diff --git a/slang_rs_backend.cpp b/slang_rs_backend.cpp
index 0d9c2d4..1e15c0d 100644
--- a/slang_rs_backend.cpp
+++ b/slang_rs_backend.cpp
@@ -60,7 +60,8 @@
       mAllowRSPrefix(AllowRSPrefix),
       mExportVarMetadata(NULL),
       mExportFuncMetadata(NULL),
-      mExportTypeMetadata(NULL) {
+      mExportTypeMetadata(NULL),
+      mRSObjectSlotsMetadata(NULL) {
   return;
 }
 
@@ -183,10 +184,15 @@
 
   // Dump export variable info
   if (mContext->hasExportVar()) {
+    int slotCount = 0;
     if (mExportVarMetadata == NULL)
       mExportVarMetadata = M->getOrInsertNamedMetadata(RS_EXPORT_VAR_MN);
 
     llvm::SmallVector<llvm::Value*, 2> ExportVarInfo;
+    llvm::SmallVector<llvm::Value*, 1> SlotVarInfo;
+
+    // We emit slot information (#rs_object_slots) for any reference counted
+    // RS type or pointer (which can also be bound).
 
     for (RSContext::const_export_var_iterator I = mContext->export_vars_begin(),
             E = mContext->export_vars_end();
@@ -194,6 +200,7 @@
          I++) {
       const RSExportVar *EV = *I;
       const RSExportType *ET = EV->getType();
+      bool countsAsRSObject = false;
 
       // Variable name
       ExportVarInfo.push_back(
@@ -202,10 +209,14 @@
       // Type name
       switch (ET->getClass()) {
         case RSExportType::ExportClassPrimitive: {
+          const RSExportPrimitiveType *PT =
+              static_cast<const RSExportPrimitiveType*>(ET);
           ExportVarInfo.push_back(
               llvm::MDString::get(
-                mLLVMContext, llvm::utostr_32(
-                  static_cast<const RSExportPrimitiveType*>(ET)->getType())));
+                mLLVMContext, llvm::utostr_32(PT->getType())));
+          if (PT->isRSObjectType()) {
+            countsAsRSObject = true;
+          }
           break;
         }
         case RSExportType::ExportClassPointer: {
@@ -239,6 +250,24 @@
                             ExportVarInfo.size()) );
 
       ExportVarInfo.clear();
+
+      if (mRSObjectSlotsMetadata == NULL) {
+        mRSObjectSlotsMetadata =
+            M->getOrInsertNamedMetadata(RS_OBJECT_SLOTS_MN);
+      }
+
+      if (countsAsRSObject) {
+        SlotVarInfo.push_back(
+            llvm::MDString::get(mLLVMContext, llvm::utostr_32(slotCount)));
+
+        mRSObjectSlotsMetadata->addOperand(
+            llvm::MDNode::get(mLLVMContext,
+                              SlotVarInfo.data(),
+                              SlotVarInfo.size()));
+      }
+
+      slotCount++;
+      SlotVarInfo.clear();
     }
   }