[pypy-svn] r58682 - pypy/dist/pypy/rpython/memory
xoraxax at codespeak.net
xoraxax at codespeak.net
Mon Oct 6 18:56:40 CEST 2008
Author: xoraxax
Date: Mon Oct 6 18:56:39 2008
New Revision: 58682
Modified:
pypy/dist/pypy/rpython/memory/lltypelayout.py
Log:
Use rffis sizeof a second time as well in lltypelayout.
Modified: pypy/dist/pypy/rpython/memory/lltypelayout.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/lltypelayout.py (original)
+++ pypy/dist/pypy/rpython/memory/lltypelayout.py Mon Oct 6 18:56:39 2008
@@ -51,7 +51,11 @@
if isinstance(TYPE, lltype.Primitive):
if TYPE == lltype.Void:
return 0
- return struct.calcsize(primitive_to_fmt[TYPE])
+ try:
+ return struct.calcsize(primitive_to_fmt[TYPE])
+ except KeyError:
+ from pypy.rpython.lltypesystem import rffi
+ return rffi.sizeof(TYPE)
elif isinstance(TYPE, lltype.Ptr):
return struct.calcsize("P")
elif isinstance(TYPE, lltype.Struct):
More information about the Pypy-commit
mailing list