[pypy-commit] pypy default: merge heads
arigo
noreply at buildbot.pypy.org
Mon Oct 31 09:22:56 CET 2011
Author: Armin Rigo <arigo at tunes.org>
Branch:
Changeset: r48619:6700af7e083b
Date: 2011-10-31 09:22 +0100
http://bitbucket.org/pypy/pypy/changeset/6700af7e083b/
Log: merge heads
diff --git a/pypy/rpython/lltypesystem/rpbc.py b/pypy/rpython/lltypesystem/rpbc.py
--- a/pypy/rpython/lltypesystem/rpbc.py
+++ b/pypy/rpython/lltypesystem/rpbc.py
@@ -116,7 +116,7 @@
fields.append((row.attrname, row.fntype))
kwds = {'hints': {'immutable': True}}
return Ptr(Struct('specfunc', *fields, **kwds))
-
+
def create_specfunc(self):
return malloc(self.lowleveltype.TO, immortal=True)
@@ -316,7 +316,7 @@
if l == range(len(r_from.descriptions)):
r = None
else:
- r = inputconst(Ptr(Array(Char)), t)
+ r = inputconst(Ptr(Array(Char, hints={'nolength': True})), t)
r_from._conversion_tables[r_to] = r
return r
@@ -404,12 +404,12 @@
# ____________________________________________________________
-##def rtype_call_memo(hop):
+##def rtype_call_memo(hop):
## memo_table = hop.args_v[0].value
## if memo_table.s_result.is_constant():
## return hop.inputconst(hop.r_result, memo_table.s_result.const)
-## fieldname = memo_table.fieldname
-## assert hop.nb_args == 2, "XXX"
+## fieldname = memo_table.fieldname
+## assert hop.nb_args == 2, "XXX"
## r_pbc = hop.args_r[1]
## assert isinstance(r_pbc, (MultipleFrozenPBCRepr, ClassesPBCRepr))
More information about the pypy-commit
mailing list