Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r54823:87bf11738d67
Date: 2012-04-30 11:54 +0200
http://bitbucket.org/pypy/pypy/changeset/87bf11738d67/
Log: merge heads
diff --git a/pypy/jit/metainterp/optimizeopt/__init__.py
b/pypy/jit/metainterp/optimizeopt/__init__.py
--- a/pypy/jit/metainterp/optimizeopt/__init__.py
+++ b/pypy/jit/metainterp/optimizeopt/__init__.py
@@ -49,7 +49,8 @@
optimizations.append(OptFfiCall())
if ('rewrite' not in enable_opts or 'virtualize' not in enable_opts
- or 'heap' not in enable_opts or 'unroll' not in enable_opts):
+ or 'heap' not in enable_opts or 'unroll' not in enable_opts
+ or 'pure' not in enable_opts):
optimizations.append(OptSimplify())
return optimizations, unroll
diff --git a/pypy/jit/metainterp/optimizeopt/heap.py
b/pypy/jit/metainterp/optimizeopt/heap.py
--- a/pypy/jit/metainterp/optimizeopt/heap.py
+++ b/pypy/jit/metainterp/optimizeopt/heap.py
@@ -257,8 +257,8 @@
opnum == rop.COPYSTRCONTENT or # no effect on GC struct/array
opnum == rop.COPYUNICODECONTENT): # no effect on GC struct/array
return
- assert opnum != rop.CALL_PURE
if (opnum == rop.CALL or
+ opnum == rop.CALL_PURE or
opnum == rop.CALL_MAY_FORCE or
opnum == rop.CALL_RELEASE_GIL or
opnum == rop.CALL_ASSEMBLER):
diff --git a/pypy/jit/metainterp/optimizeopt/optimizer.py
b/pypy/jit/metainterp/optimizeopt/optimizer.py
--- a/pypy/jit/metainterp/optimizeopt/optimizer.py
+++ b/pypy/jit/metainterp/optimizeopt/optimizer.py
@@ -525,6 +525,7 @@
@specialize.argtype(0)
def _emit_operation(self, op):
+ assert op.getopnum() != rop.CALL_PURE
for i in range(op.numargs()):
arg = op.getarg(i)
try:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
