Author: Armin Rigo <ar...@tunes.org>
Branch: shadowstack-perf-2
Changeset: r84820:94326a60b7b7
Date: 2016-05-29 19:35 +0200
http://bitbucket.org/pypy/pypy/changeset/94326a60b7b7/
Log: Can't have any more both minimal_transform=False and inline=True,
but the only cases where it occurred seem to be bogus anyway: we
already inline id_or_identityhash() inside id() and identityhash()
diff --git a/rpython/memory/gctransform/framework.py
b/rpython/memory/gctransform/framework.py
--- a/rpython/memory/gctransform/framework.py
+++ b/rpython/memory/gctransform/framework.py
@@ -232,6 +232,9 @@
if minimal_transform:
self.need_minimal_transform(graph)
if inline:
+ assert minimal_transform, (
+ "%r has both inline=True and minimal_transform=False"
+ % (graph,))
self.graphs_to_inline[graph] = True
return annhelper.graph2const(graph)
@@ -437,7 +440,7 @@
self.identityhash_ptr = getfn(GCClass.identityhash.im_func,
[s_gc, s_gcref],
annmodel.SomeInteger(),
- minimal_transform=False, inline=True)
+ minimal_transform=False)
if getattr(GCClass, 'obtain_free_space', False):
self.obtainfreespace_ptr = getfn(GCClass.obtain_free_space.im_func,
[s_gc, annmodel.SomeInteger()],
@@ -446,7 +449,6 @@
if GCClass.moving_gc:
self.id_ptr = getfn(GCClass.id.im_func,
[s_gc, s_gcref], annmodel.SomeInteger(),
- inline = True,
minimal_transform = False)
else:
self.id_ptr = None
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
