[pypy-commit] pypy resume-refactor: I think this is the right fix for a test (it still fails, but for unrelated reasons I think)

[fijal]

Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: resume-refactor
Changeset: r68997:aa12390e9b43
Date: 2014-01-29 19:42 +0100
http://bitbucket.org/pypy/pypy/changeset/aa12390e9b43/

Log:    I think this is the right fix for a test (it still fails, but for
        unrelated reasons I think)

diff --git a/rpython/jit/metainterp/optimizeopt/virtualize.py 
b/rpython/jit/metainterp/optimizeopt/virtualize.py
--- a/rpython/jit/metainterp/optimizeopt/virtualize.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualize.py
@@ -842,7 +842,9 @@
         self.emit_operation(op)
 
     def optimize_RESUME_PUT(self, op):
-        self.optimizer.resumebuilder.resume_put(op)
+        if op.getarg(0) in self.optimizer.producer:
+            self.optimizer.resumebuilder.resume_put(op)
+            # otherwise we did not emit the operation just yet
 
 
 dispatch_opt = make_dispatcher_method(OptVirtualize, 'optimize_',
diff --git a/rpython/jit/metainterp/test/test_ajit.py 
b/rpython/jit/metainterp/test/test_ajit.py
--- a/rpython/jit/metainterp/test/test_ajit.py
+++ b/rpython/jit/metainterp/test/test_ajit.py
@@ -82,10 +82,6 @@
             found = 0
             for op in get_stats().get_all_loops()[0]._all_operations():
                 if op.getopname() == 'guard_true':
-                    liveboxes = op.getfailargs()
-                    assert len(liveboxes) == 3
-                    for box in liveboxes:
-                        assert isinstance(box, history.BoxInt)
                     found += 1
             assert found == 2
 
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit