Author: Maciej Fijalkowski <[email protected]>
Branch: callback-jit
Changeset: r59570:f3df9baf6bd5
Date: 2012-12-26 21:19 +0200
http://bitbucket.org/pypy/pypy/changeset/f3df9baf6bd5/
Log: fix, maybe?
diff --git a/pypy/jit/metainterp/warmspot.py b/pypy/jit/metainterp/warmspot.py
--- a/pypy/jit/metainterp/warmspot.py
+++ b/pypy/jit/metainterp/warmspot.py
@@ -1008,6 +1008,11 @@
origblock.operations.append(newop)
origblock.exitswitch = None
origblock.recloseblock(Link([v_result], origportalgraph.returnblock))
+ # the origportal now can raise (even if it did not raise before),
+ # which means that we cannot inline it anywhere any more, but that's
+ # fine since any forced inlining has been done before
+ if hasattr(origportalgraph, '_always_inline_'):
+ del origportalgraph._always_inline_
#
checkgraph(origportalgraph)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
