Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: jitframe-on-heap
Changeset: r60684:c88fd8172c57
Date: 2013-01-29 16:19 +0200
http://bitbucket.org/pypy/pypy/changeset/c88fd8172c57/
Log: happily ignore the immortal parameter
diff --git a/rpython/annotator/builtin.py b/rpython/annotator/builtin.py
--- a/rpython/annotator/builtin.py
+++ b/rpython/annotator/builtin.py
@@ -405,7 +405,7 @@
from rpython.rtyper.lltypesystem import lltype
def malloc(s_T, s_n=None, s_flavor=None, s_zero=None, s_track_allocation=None,
- s_add_memory_pressure=None):
+ s_add_memory_pressure=None, s_immortal=None):
assert (s_n is None or s_n.knowntype == int
or issubclass(s_n.knowntype, rpython.rlib.rarithmetic.base_int))
assert s_T.is_constant()
diff --git a/rpython/rtyper/rbuiltin.py b/rpython/rtyper/rbuiltin.py
--- a/rpython/rtyper/rbuiltin.py
+++ b/rpython/rtyper/rbuiltin.py
@@ -357,7 +357,7 @@
# annotation of low-level types
def rtype_malloc(hop, i_flavor=None, i_zero=None, i_track_allocation=None,
- i_add_memory_pressure=None):
+ i_add_memory_pressure=None, i_immortal=None):
assert hop.args_s[0].is_constant()
vlist = [hop.inputarg(lltype.Void, arg=0)]
opname = 'malloc'
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
