[pypy-commit] pypy remove-raisingops: Revert these two changes from default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: remove-raisingops
Changeset: r84708:6d7f04b4d19c
Date: 2016-05-26 15:09 +0100
http://bitbucket.org/pypy/pypy/changeset/6d7f04b4d19c/

Log:	Revert these two changes from default

diff --git a/rpython/translator/test/test_simplify.py b/rpython/translator/test/test_simplify.py
--- a/rpython/translator/test/test_simplify.py
+++ b/rpython/translator/test/test_simplify.py
@@ -23,11 +23,9 @@
             return ovfcheck(x*2)
         except OverflowError:
             return -42
-    graph, _ = translate(f, [int], backend_optimize=False)
+    graph, _ = translate(f, [int])
     assert len(graph.startblock.operations) == 1
-    assert graph.startblock.operations[0].opname == 'direct_call'
-    assert 'll_int_mul_ovf' in repr(
-        graph.startblock.operations[0].args[0].value)
+    assert graph.startblock.operations[0].opname == 'int_mul_ovf'
     assert len(graph.startblock.exits) == 2
     assert [link.target.operations for link in graph.startblock.exits] == \
            [(), ()]
@@ -38,9 +36,9 @@
     from rpython.rlib.rarithmetic import ovfcheck
     def f(x):
         return ovfcheck(x*2) - 1
-    graph, _ = translate(f, [int], backend_optimize=False)
+    graph, _ = translate(f, [int])
     assert len(graph.startblock.operations) == 2
-    assert graph.startblock.operations[0].opname == 'direct_call'
+    assert graph.startblock.operations[0].opname == 'int_mul_ovf'
     assert graph.startblock.operations[1].opname == 'int_sub'
 
 def test_remove_ovfcheck_floordiv():