commit d82c527a2a3b8d5ee165dea3ffeaf643ef6c606e
author Stephen Hines <srhines@google.com> Thu Oct 18 18:08:28 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 18 18:08:28 2012 -0700
tree 0a7ef4f8c77d48d94323fe69472280f491506134
parent af0d05f17010986121d6199f247b772a97250227
parent 6f3138bbc93b7105ddb49a803c15c3f98077f533

am 6f3138bb: Fix missing data for mObjectSlots.

* commit '6f3138bbc93b7105ddb49a803c15c3f98077f533':
  Fix missing data for mObjectSlots.

lib/Renderscript/RSInfoExtractor.cpp

diff --git a/lib/Renderscript/RSInfoExtractor.cpp b/lib/Renderscript/RSInfoExtractor.cpp
index 3392982..4ba5703 100644
--- a/lib/Renderscript/RSInfoExtractor.cpp
+++ b/lib/Renderscript/RSInfoExtractor.cpp
@@ -338,6 +338,9 @@
   //===--------------------------------------------------------------------===//
   if (object_slots != NULL) {
     llvm::MDNode *node;
+    for (unsigned int i = 0; i <= export_var->getNumOperands(); i++) {
+      result->mObjectSlots.push(0);
+    }
     FOR_EACH_NODE_IN(object_slots, node) {
       llvm::StringRef val = getStringFromOperand(node->getOperand(0));
       if (val.empty()) {
@@ -349,6 +352,8 @@
           ALOGE("Non-integer object slot value '%s' in %s!", val.str().c_str(),
                 module.getModuleIdentifier().c_str());
           goto bail;
+        } else {
+          result->mObjectSlots.editItemAt(slot) = 1;
         }
       }
     }