Author: Armin Rigo <ar...@tunes.org>
Branch: remove-objspace-options
Changeset: r83864:a350fbd4215a
Date: 2016-04-25 15:08 +0200
http://bitbucket.org/pypy/pypy/changeset/a350fbd4215a/
Log: Fix the assert:
* it should check the effectinfo we got, and not just the
extraeffect we sent to effectinfo_from_writeanalyze();
* it should also crash if EF_RANDOM_EFFECTS.
diff --git a/rpython/jit/codewriter/call.py b/rpython/jit/codewriter/call.py
--- a/rpython/jit/codewriter/call.py
+++ b/rpython/jit/codewriter/call.py
@@ -301,7 +301,8 @@
#
assert effectinfo is not None
if elidable or loopinvariant:
- assert extraeffect != EffectInfo.EF_FORCES_VIRTUAL_OR_VIRTUALIZABLE
+ assert (effectinfo.extraeffect <
+ EffectInfo.EF_FORCES_VIRTUAL_OR_VIRTUALIZABLE)
# XXX this should also say assert not can_invalidate, but
# it can't because our analyzer is not good enough for now
# (and getexecutioncontext() can't really invalidate)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
