[pypy-commit] pypy ffistruct: merge heads

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: ffistruct
Changeset: r47181:7bcdee76d84b
Date: 2011-09-09 11:52 +0200
http://bitbucket.org/pypy/pypy/changeset/7bcdee76d84b/

Log:	merge heads

diff --git a/pypy/module/_ffi/interp_struct.py b/pypy/module/_ffi/interp_struct.py
--- a/pypy/module/_ffi/interp_struct.py
+++ b/pypy/module/_ffi/interp_struct.py
@@ -46,7 +46,7 @@
     def allocate(self, space):
         return W__StructInstance(self)
 
-    @jit.elidable_promote()
+    @jit.elidable_promote('0')
     def get_type_and_offset_for_field(self, name):
         try:
             w_field = self.name2w_field[name]