jyapayne/llvmpy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:llvmpy/llvmpy

Browse source
This commit is contained in:
Maggie Mari 2012-08-15 18:34:23 -05:00
commit 57d78fb42e
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
llvm/extra.cpp
View file

@ -706,7 +706,7 @@ template <typename W, typename UW>
void unwrap_vec(W *values, unsigned n, std::vector<UW *>& out) void unwrap_vec(W *values, unsigned n, std::vector<UW *>& out)
{ {
out.clear(); out.clear();
out.reserve(n);
while (n--) { while (n--) {
UW *p = llvm::unwrap(*values); UW *p = llvm::unwrap(*values);
assert(p); assert(p);
@ -847,7 +847,7 @@ LLVMValueRef LLVMGetIntrinsic(LLVMModuleRef module, int id,
assert(modulep); assert(modulep);
llvm::Function *intfunc = llvm::Intrinsic::getDeclaration(modulep, llvm::Function *intfunc = llvm::Intrinsic::getDeclaration(modulep,
llvm::Intrinsic::ID(id), types_vec[0]); llvm::Intrinsic::ID(id), types_vec);
return wrap(intfunc); return wrap(intfunc);
} }

4
llvm/wrap.h
View file

@ -1054,7 +1054,7 @@ _w ## func (PyObject *self, PyObject *args) \
{ \ { \
PyObject *obj1, *obj2; \ PyObject *obj1, *obj2; \
intype1 arg1; \ intype1 arg1; \
intype2 *arg2v; \ intype2 *arg2v = NULL; \
unsigned arg2n; \ unsigned arg2n; \
int arg3; \ int arg3; \
outtype ret; \ outtype ret; \
@ -1064,7 +1064,7 @@ _w ## func (PyObject *self, PyObject *args) \
\ \
arg1 = ( intype1 ) PyCapsule_GetPointer(obj1, NULL); \ arg1 = ( intype1 ) PyCapsule_GetPointer(obj1, NULL); \
arg2n = (unsigned) PyList_Size(obj2); \ 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(); \ return PyErr_NoMemory(); \
\ \
ret = func (arg1, arg2v, arg2n, arg3); \ ret = func (arg1, arg2v, arg2n, arg3); \