[pypy-commit] pypy default: minor simplification of the code

antocuni noreply at buildbot.pypy.org
Tue Jun 14 18:07:43 CEST 2011


Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: 
Changeset: r44954:4d02e779e0dd
Date: 2011-06-14 17:46 +0200
http://bitbucket.org/pypy/pypy/changeset/4d02e779e0dd/

Log:	minor simplification of the code

diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -57,17 +57,17 @@
 
 class BaseTestOptimizeOpt(BaseTest):
 
-    def optimize_loop(self, ops, optops, expected_preamble=None,
+    def optimize_loop(self, ops, expected, expected_preamble=None,
                       call_pure_results=None):
         loop = self.parse(ops)
-        if optops != "crash!":
-            expected = self.parse(optops)
-        else:
-            expected = "crash!"
+        self.loop = loop
+
+        if expected != "crash!":
+            expected = self.parse(expected)
         if expected_preamble:
             expected_preamble = self.parse(expected_preamble)
         #
-        self.loop = loop
+
         loop.call_pure_results = args_dict()
         if call_pure_results is not None:
             for k, v in call_pure_results.items():
@@ -80,6 +80,7 @@
             metainterp_sd.virtualref_info = self.vrefinfo
         if hasattr(self, 'callinfocollection'):
             metainterp_sd.callinfocollection = self.callinfocollection
+
         class FakeDescr(compile.ResumeGuardDescr):
             class rd_snapshot:
                 class prev:


More information about the pypy-commit mailing list