[pypy-commit] pypy guard-compatible: fix missing part of a previous commit 931f5eaed82f

Raemi pypy.commits at gmail.com
Wed Mar 21 06:44:49 EDT 2018


Author: Remi Meier <remi.meier at gmail.com>
Branch: guard-compatible
Changeset: r94049:84015df039c9
Date: 2018-03-21 11:43 +0100
http://bitbucket.org/pypy/pypy/changeset/84015df039c9/

Log:	fix missing part of a previous commit 931f5eaed82f

	Apparently we missed another place where ResumeAtPosition..() was
	required. This second part of the previous commit 931f5eaed82f
	reduces the number of bridges created in the richards benchmark from
	twice as many bridges to slightly less bridges compared to default-
	pypy. However, there are tests failing that probably just need
	updating.

diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -420,7 +420,7 @@
                 arglist = self._map_args(mapping, sop.getarglist())
                 if sop.is_guard():
                     if sop.opnum == rop.GUARD_COMPATIBLE:
-                        descr = compile.GuardCompatibleDescr()
+                        descr = compile.ResumeAtPositionForCompatibleDescr()
                     else:
                         descr = compile.ResumeAtPositionDescr()
                     op = sop.copy_and_change(sop.getopnum(), arglist,


More information about the pypy-commit mailing list