Fix get intrinsic

alex · Aug 15, 2012 · 7880cdd · 7880cdd
1 parent 3807871
commit 7880cdd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/llvm/extra.cpp b/llvm/extra.cpp
@@ -706,7 +706,7 @@ template <typename W, typename UW>
 void unwrap_vec(W *values, unsigned n, std::vector<UW *>& out)
 {
     out.clear();
-
+    out.reserve(n);
     while (n--) {
         UW *p = llvm::unwrap(*values);
         assert(p);
@@ -847,7 +847,7 @@ LLVMValueRef LLVMGetIntrinsic(LLVMModuleRef module, int id,
     assert(modulep);
 
     llvm::Function *intfunc = llvm::Intrinsic::getDeclaration(modulep,
-				     llvm::Intrinsic::ID(id), types_vec[0]);
+				     llvm::Intrinsic::ID(id), types_vec);
 
     return wrap(intfunc);
 }

diff --git a/llvm/wrap.h b/llvm/wrap.h
@@ -1054,7 +1054,7 @@ _w ## func (PyObject *self, PyObject *args)                      \
 {                                                                \
     PyObject *obj1, *obj2;                                       \
     intype1 arg1;                                                \
-    intype2 *arg2v;                                              \
+    intype2 *arg2v = NULL;                                       \
     unsigned arg2n;                                              \
     int arg3;                                                    \
     outtype ret;                                                 \
@@ -1064,7 +1064,7 @@ _w ## func (PyObject *self, PyObject *args)                      \
                                                                  \
     arg1 = ( intype1 ) PyCapsule_GetPointer(obj1, NULL);         \
     arg2n = (unsigned) PyList_Size(obj2);                        \
-    if (!(arg2v = ( intype2 *)make_array_from_list(obj2, arg2n)))\
+    if (arg2n && !(arg2v = ( intype2 *)make_array_from_list(obj2, arg2n)))\
         return PyErr_NoMemory();                                 \
                                                                  \
     ret = func (arg1, arg2v, arg2n, arg3);                       \