[pypy-commit] pypy optresult: hack hack hack until we get the right oparse (I don't want to care)

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult
Changeset: r74547:f1b9844b75c5
Date: 2014-11-17 12:03 +0200
http://bitbucket.org/pypy/pypy/changeset/f1b9844b75c5/

Log:	hack hack hack until we get the right oparse (I don't want to care)

diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -114,7 +114,8 @@
             def _oparser_uses_descr_of_guard(self, oparse, fail_args):
                 # typically called 3 times: once when parsing 'ops',
                 # once when parsing 'preamble', once when parsing 'expected'.
-                self.oparse = oparse
+                if self.oparse is None:
+                    self.oparse = oparse
                 self.rd_frame_info_list, self.rd_snapshot = snapshot(fail_args)
             def _clone_if_mutable(self):
                 assert self is fdescr
diff --git a/rpython/jit/metainterp/optimizeopt/util.py b/rpython/jit/metainterp/optimizeopt/util.py
--- a/rpython/jit/metainterp/optimizeopt/util.py
+++ b/rpython/jit/metainterp/optimizeopt/util.py
@@ -168,7 +168,8 @@
             assert op1.same_box(remap[op2])
         else:
             remap[op2] = op1
-        if op1.getopnum() not in (rop.JUMP, rop.LABEL) and not op1.is_guard():      # xxx obscure
+        if op1.getopnum() not in (rop.JUMP, rop.LABEL) and not op1.is_guard():
+            # xxx obscure
             assert op1.getdescr() == op2.getdescr()
         if op1.getfailargs() or op2.getfailargs():
             assert len(op1.getfailargs()) == len(op2.getfailargs())