Author: Armin Rigo <[email protected]>
Branch: optresult
Changeset: r76273:1188016be42b
Date: 2015-03-07 15:02 +0100
http://bitbucket.org/pypy/pypy/changeset/1188016be42b/
Log: hg merge recent-pure-ops (again)
diff --git a/rpython/jit/metainterp/resoperation.py
b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -837,6 +837,13 @@
if debug_print:
print '%30s = %d' % (name, i)
i += 1
+ # for optimizeopt/pure.py's getrecentops()
+ assert (rop.INT_ADD_OVF - rop._OVF_FIRST ==
+ rop.INT_ADD - rop._ALWAYS_PURE_FIRST)
+ assert (rop.INT_SUB_OVF - rop._OVF_FIRST ==
+ rop.INT_SUB - rop._ALWAYS_PURE_FIRST)
+ assert (rop.INT_MUL_OVF - rop._OVF_FIRST ==
+ rop.INT_MUL - rop._ALWAYS_PURE_FIRST)
def get_base_class(mixins, base):
try:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
