commit be42b8a2ef3e5bb7603b974f32dc25caba1bc716
author Tim Murray <timmurray@google.com> Mon Mar 30 19:31:18 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 30 19:31:18 2015 +0000
tree e94e62835b5495b14d5dbbd883e618cb961eabbb
parent ff7b1d467648aea6e771f78abcd7c5082827944f
parent 4100e8e25a51279b7586f5678a141fd85e33413f

Merge "Add bitcast to invoke helper pass."

lib/Renderscript/RSInvokeHelperPass.cpp

diff --git a/lib/Renderscript/RSInvokeHelperPass.cpp b/lib/Renderscript/RSInvokeHelperPass.cpp
index 58a1e62..94213f5 100644
--- a/lib/Renderscript/RSInvokeHelperPass.cpp
+++ b/lib/Renderscript/RSInvokeHelperPass.cpp
@@ -119,25 +119,36 @@
 
   bool insertSetObjectHelper(llvm::CallInst *Call, llvm::Value *V, llvm::StringRef StructName) {
     llvm::Constant *SetObj = nullptr;
+    llvm::StructType *RSStructType = nullptr;
     if (StructName.equals(rsAllocationType->getName())) {
       SetObj = rsAllocationSetObj;
+      RSStructType = rsAllocationType;
     } else if (StructName.equals(rsElementType->getName())) {
       SetObj = rsElementSetObj;
+      RSStructType = rsElementType;
     } else if (StructName.equals(rsSamplerType->getName())) {
       SetObj = rsSamplerSetObj;
+      RSStructType = rsSamplerType;
     } else if (StructName.equals(rsScriptType->getName())) {
       SetObj = rsScriptSetObj;
+      RSStructType = rsScriptType;
     } else if (StructName.equals(rsTypeType->getName())) {
       SetObj = rsTypeSetObj;
+      RSStructType = rsTypeType;
     } else {
       return false; // this is for graphics types and matrices; do nothing
     }
 
+
+    llvm::CastInst* CastedValue = llvm::CastInst::CreatePointerCast(V, RSStructType->getPointerTo(), "", Call);
+
     llvm::SmallVector<llvm::Value*, 2> SetObjParams;
-    SetObjParams.push_back(V);
-    SetObjParams.push_back(V);
+    SetObjParams.push_back(CastedValue);
+    SetObjParams.push_back(CastedValue);
 
     llvm::CallInst::Create(SetObj, SetObjParams, "", Call);
+
+
     return true;
   }