Author: Remi Meier <remi.me...@gmail.com>
Branch: guard-compatible
Changeset: r94035:c13441bb1f3b
Date: 2018-03-20 15:56 +0100
http://bitbucket.org/pypy/pypy/changeset/c13441bb1f3b/
Log: (arigo, remi) fix test
diff --git a/rpython/jit/metainterp/compatible.py
b/rpython/jit/metainterp/compatible.py
--- a/rpython/jit/metainterp/compatible.py
+++ b/rpython/jit/metainterp/compatible.py
@@ -64,7 +64,8 @@
def register_quasi_immut_field(self, op, optimizer):
from rpython.jit.metainterp.quasiimmut import QuasiImmutDescr
- assert optimizer.ensure_ptr_info_arg0(op)._compatibility_conditions is
self
+ if optimizer is not None: # for test
+ assert
optimizer.ensure_ptr_info_arg0(op)._compatibility_conditions is self
descr = op.getdescr()
assert isinstance(descr, QuasiImmutDescr)
self.last_quasi_immut_field_descr = descr
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_virtualstate.py
b/rpython/jit/metainterp/optimizeopt/test/test_virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_virtualstate.py
@@ -538,7 +538,8 @@
# call with quasi-immut
box = InputArgRef()
ccond.register_quasi_immut_field(
- ResOperation(rop.QUASIIMMUT_FIELD, [box], self.quasiimmutdescr))
+ ResOperation(rop.QUASIIMMUT_FIELD, [box], self.quasiimmutdescr),
+ optimizer=None)
getfield_op = ResOperation(
rop.GETFIELD_GC_I, [box], self.quasifielddescr)
op = ResOperation(
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
