[pypy-commit] pypy default: fix the test

[fijal]

Author: fijal
Branch: 
Changeset: r79999:43f8aaef0f6e
Date: 2015-10-06 07:24 +0200
http://bitbucket.org/pypy/pypy/changeset/43f8aaef0f6e/

Log:	fix the test

diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -646,10 +646,12 @@
 
     def _copy_resume_data_from(self, guard_op, last_guard_op):
         descr = compile.invent_fail_descr_for_op(guard_op.getopnum(), self, True)
-        assert isinstance(descr, compile.ResumeGuardCopiedDescr)
         last_descr = last_guard_op.getdescr()
         assert isinstance(last_descr, compile.ResumeGuardDescr)
-        descr.prev = last_descr
+        if isinstance(descr, compile.ResumeGuardCopiedDescr):
+            descr.prev = last_descr
+        else:
+            descr.copy_all_attributes_from(last_descr)
         guard_op.setdescr(descr)
         guard_op.setfailargs(last_guard_op.getfailargs())
         descr.store_hash(self.metainterp_sd)