[pypy-commit] pypy jitframe-on-heap: Backout c88fd8172c57: it's nonsense to translate RPython code

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: jitframe-on-heap
Changeset: r61819:315181cc8ad2
Date: 2013-02-26 11:23 +0100
http://bitbucket.org/pypy/pypy/changeset/315181cc8ad2/

Log:	Backout c88fd8172c57: it's nonsense to translate RPython code which
	calls malloc(immortal=True).

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_immortal=None):
+           s_add_memory_pressure=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_immortal=None):
+                 i_add_memory_pressure=None):
     assert hop.args_s[0].is_constant()
     vlist = [hop.inputarg(lltype.Void, arg=0)]
     opname = 'malloc'