commit 7c67e578c760408dba0c2f64da6e074dd8b56fd9
author Shih-wei Liao <sliao@google.com> Tue Jul 19 05:54:53 2011 -0700
committer Shih-wei Liao <sliao@google.com> Tue Jul 19 05:54:53 2011 -0700
tree 3ac307becda33e7fbb50a170e30ab6186bfb8099
parent 18c8829f2bd3cbe0d02471588c6643c0a8c6ca3c

Apply changes to migrate to upstream API.

Change-Id: Ibe6060a0d1c42b9725524de7f4cb95551b711717

slang_rs_backend.cpp

diff --git a/slang_rs_backend.cpp b/slang_rs_backend.cpp
index b10b27b..6459d14 100644
--- a/slang_rs_backend.cpp
+++ b/slang_rs_backend.cpp
@@ -298,13 +298,15 @@
           llvm::StructType *HelperFunctionParameterTy = NULL;
 
           if (!F->getArgumentList().empty()) {
-            std::vector<const llvm::Type*> HelperFunctionParameterTys;
+            std::vector<llvm::Type*> HelperFunctionParameterTys;
             for (llvm::Function::arg_iterator AI = F->arg_begin(),
                  AE = F->arg_end(); AI != AE; AI++)
               HelperFunctionParameterTys.push_back(AI->getType());
 
             HelperFunctionParameterTy =
-                llvm::StructType::get(mLLVMContext, HelperFunctionParameterTys);
+                llvm::StructType::get(mLLVMContext,
+                                      llvm::ArrayRef<llvm::Type*>(
+                                          HelperFunctionParameterTys));
           }
 
           if (!EF->checkParameterPacketType(HelperFunctionParameterTy)) {
@@ -323,7 +325,7 @@
             }
           }
 
-          std::vector<const llvm::Type*> Params;
+          std::vector<llvm::Type*> Params;
           if (HelperFunctionParameterTy) {
             llvm::PointerType *HelperFunctionParameterTyP =
                 llvm::PointerType::getUnqual(HelperFunctionParameterTy);
@@ -332,7 +334,7 @@
 
           llvm::FunctionType * HelperFunctionType =
               llvm::FunctionType::get(F->getReturnType(),
-                                      Params,
+                                      llvm::ArrayRef<llvm::Type*>(Params),
                                       /* IsVarArgs = */false);
 
           HelperFunction =
@@ -375,8 +377,8 @@
 
             // Call and pass the all elements as paramter to F
             llvm::CallInst *CI = IB->CreateCall(F,
-                                                Params.data(),
-                                                Params.data() + Params.size());
+                                                llvm::ArrayRef<llvm::Value*>(
+                                                    Params));
 
             CI->setCallingConv(F->getCallingConv());