[pypy-commit] pypy default: copy cffi/e09ccb6b8d89

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r81448:cdd09c7fd673
Date: 2015-12-28 11:57 +0100
http://bitbucket.org/pypy/pypy/changeset/cdd09c7fd673/

Log:	copy cffi/e09ccb6b8d89

diff --git a/pypy/module/_cffi_backend/ctypefunc.py b/pypy/module/_cffi_backend/ctypefunc.py
--- a/pypy/module/_cffi_backend/ctypefunc.py
+++ b/pypy/module/_cffi_backend/ctypefunc.py
@@ -423,7 +423,9 @@
             exchange_offset += rffi.getintfield(self.atypes[i], 'c_size')
 
         # store the exchange data size
-        cif_descr.exchange_size = exchange_offset
+        # we also align it to the next multiple of 8, in an attempt to
+        # work around bugs(?) of libffi (see cffi issue #241)
+        cif_descr.exchange_size = self.align_arg(exchange_offset)
 
     def fb_extra_fields(self, cif_descr):
         cif_descr.abi = self.fabi