[pypy-commit] pypy result-in-resops: more tests

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: result-in-resops
Changeset: r57489:9e02b383c8f3
Date: 2012-09-23 20:31 +0200
http://bitbucket.org/pypy/pypy/changeset/9e02b383c8f3/

Log:	more tests

diff --git a/pypy/jit/metainterp/optimizeopt/pure.py b/pypy/jit/metainterp/optimizeopt/pure.py
--- a/pypy/jit/metainterp/optimizeopt/pure.py
+++ b/pypy/jit/metainterp/optimizeopt/pure.py
@@ -107,7 +107,7 @@
         return op.getdescr() is descr
 
     def get_pure_result(self, key):
-        return self.pure_operations.get(key, None)
+        return self.pure_operations.get(key)
 
     def remember_emitting_pure(self, op):
         self.emitted_pure_operations.append(op)
diff --git a/pypy/jit/metainterp/optimizeopt/rewrite.py b/pypy/jit/metainterp/optimizeopt/rewrite.py
--- a/pypy/jit/metainterp/optimizeopt/rewrite.py
+++ b/pypy/jit/metainterp/optimizeopt/rewrite.py
@@ -29,8 +29,8 @@
 
         dispatch_opt(self, op)
 
-    def try_boolinvers(self, op, targs):
-        oldop = self.get_pure_result(targs)
+    def try_boolinvers(self, op, key_op):
+        oldop = self.get_pure_result(key_op)
         if oldop is not None and oldop.getdescr() is op.getdescr():
             value = self.getvalue(oldop)
             if value.is_constant():
@@ -47,25 +47,22 @@
     def find_rewritable_bool(self, op):
         oldopnum = opboolinvers[op.getopnum()]
         if oldopnum != -1:
-            targs = self.optimizer.make_args_key(ResOperation(oldopnum, [args[0], args[1]],
-                                                              None))
-            if self.try_boolinvers(op, targs):
+            key_op = op.copy_and_change(oldopnum)
+            if self.try_boolinvers(op, key_op):
                 return True
 
         oldopnum = opboolreflex[op.getopnum()] # FIXME: add INT_ADD, INT_MUL
         if oldopnum != -1:
-            targs = self.optimizer.make_args_key(ResOperation(oldopnum, [args[1], args[0]],
-                                                              None))
-            oldop = self.get_pure_result(targs)
+            key_op = op.copy_and_change(oldopnum)
+            oldop = self.get_pure_result(key_op)
             if oldop is not None and oldop.getdescr() is op.getdescr():
                 self.make_equal_to(op, self.getvalue(oldop))
                 return True
 
         oldopnum = opboolinvers[opboolreflex[op.getopnum()]]
         if oldopnum != -1:
-            targs = self.optimizer.make_args_key(ResOperation(oldopnum, [args[1], args[0]],
-                                                              None))
-            if self.try_boolinvers(op, targs):
+            key_op = op.copy_and_change(oldopnum)
+            if self.try_boolinvers(op, key_op):
                 return True
 
         return False