commit f0c8a70c572b1f89a998ce9dec1db24ce7bc67cd
author Shih-wei Liao <sliao@google.com> Mon Sep 24 23:33:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 24 23:33:06 2012 -0700
tree 5c4f19785e7666540dd9190cd5ead8baa3a5c5a8
parent befe61885c4d3c59ade5ebfab3a82de97c94e8fe
parent f3eb9b8c5bb3198aff2878de4dae4e70e5ef3900

Merge "Support -z options in bcc::Linker."

lib/Renderscript/RSForEachExpand.cpp

diff --git a/lib/Renderscript/RSForEachExpand.cpp b/lib/Renderscript/RSForEachExpand.cpp
index ead1d1e..443f0af 100644
--- a/lib/Renderscript/RSForEachExpand.cpp
+++ b/lib/Renderscript/RSForEachExpand.cpp
@@ -115,7 +115,7 @@
     llvm::Type *VoidPtrTy = llvm::Type::getInt8PtrTy(*C);
     if (mEnableStepOpt && T != VoidPtrTy && PT) {
       llvm::Type *ET = PT->getElementType();
-      uint64_t ETSize = TD->getTypeStoreSize(ET);
+      uint64_t ETSize = TD->getTypeAllocSize(ET);
       llvm::Type *Int32Ty = llvm::Type::getInt32Ty(*C);
       return llvm::ConstantInt::get(Int32Ty, ETSize);
     } else {
@@ -487,6 +487,26 @@
     // Note that we load any loop-invariant arguments before entering the Loop.
     llvm::Function::arg_iterator Args = F->arg_begin();
 
+    llvm::Type *OutTy = NULL;
+    llvm::AllocaInst *AOut = NULL;
+    bool PassOutByReference = false;
+    if (hasOut(Signature)) {
+      llvm::Type *OutBaseTy = F->getReturnType();
+      if (OutBaseTy->isVoidTy()) {
+        PassOutByReference = true;
+        OutTy = Args->getType();
+        Args++;
+      } else {
+        OutTy = OutBaseTy->getPointerTo();
+        // We don't increment Args, since we are using the actual return type.
+      }
+      AOut = Builder.CreateAlloca(OutTy, 0, "AOut");
+      OutStep = getStepValue(&TD, OutTy, Arg_outstep);
+      OutStep->setName("outstep");
+      Builder.CreateStore(Builder.CreatePointerCast(Builder.CreateLoad(
+          Builder.CreateStructGEP(Arg_p, 1)), OutTy), AOut);
+    }
+
     llvm::Type *InBaseTy = NULL;
     llvm::Type *InTy = NULL;
     llvm::AllocaInst *AIn = NULL;
@@ -501,20 +521,6 @@
       Args++;
     }
 
-    llvm::Type *OutBaseTy = NULL;
-    llvm::Type *OutTy = NULL;
-    llvm::AllocaInst *AOut = NULL;
-    if (hasOut(Signature)) {
-      OutBaseTy = F->getReturnType();
-      OutTy = OutBaseTy->getPointerTo();
-      AOut = Builder.CreateAlloca(OutTy, 0, "AOut");
-      OutStep = getStepValue(&TD, OutTy, Arg_outstep);
-      OutStep->setName("outstep");
-      Builder.CreateStore(Builder.CreatePointerCast(Builder.CreateLoad(
-          Builder.CreateStructGEP(Arg_p, 1)), OutTy), AOut);
-      // We don't increment Args, since we are using the actual return type.
-    }
-
     // No usrData parameter on kernels.
     bccAssert(!hasUsrData(Signature));
 
@@ -547,6 +553,11 @@
     llvm::Value *In = NULL;
     llvm::Value *OutPtr = NULL;
 
+    if (PassOutByReference) {
+      OutPtr = Builder.CreateLoad(AOut, "OutPtr");
+      RootArgs.push_back(OutPtr);
+    }
+
     if (AIn) {
       InPtr = Builder.CreateLoad(AIn, "InPtr");
       In = Builder.CreateLoad(InPtr, "In");
@@ -565,7 +576,7 @@
 
     llvm::Value *RetVal = Builder.CreateCall(F, RootArgs);
 
-    if (AOut) {
+    if (AOut && !PassOutByReference) {
       OutPtr = Builder.CreateLoad(AOut, "OutPtr");
       Builder.CreateStore(RetVal, OutPtr);
     }