[pypy-commit] pypy ffi-backend: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: ffi-backend
Changeset: r56525:5e3d8c9acbe4
Date: 2012-08-01 17:13 +0200
http://bitbucket.org/pypy/pypy/changeset/5e3d8c9acbe4/

Log:	merge heads

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
@@ -24,7 +24,7 @@
 
 class W_CTypeFunc(W_CTypePtrBase):
     _attrs_            = ['fargs', 'ellipsis', 'cif_descr']
-    _immutable_fields_ = ['fargs', 'ellipsis', 'cif_descr']
+    _immutable_fields_ = ['fargs[*]', 'ellipsis', 'cif_descr']
 
     def __init__(self, space, fargs, fresult, ellipsis):
         extra = self._compute_extra_text(fargs, fresult, ellipsis)
@@ -213,7 +213,8 @@
     ('cif', FFI_CIF),
     ('exchange_size', lltype.Signed),
     ('exchange_result', lltype.Signed),
-    ('exchange_args', rffi.CArray(lltype.Signed)),
+    ('exchange_args', lltype.Array(lltype.Signed,
+                          hints={'nolength': True, 'immutable': True})),
     hints={'immutable': True})
 
 CIF_DESCRIPTION_P = lltype.Ptr(CIF_DESCRIPTION)