Author: Alex Gaynor <alex.gay...@gmail.com>
Branch: inline-virtualref-2
Changeset: r60389:49b84471ada8
Date: 2013-01-23 13:40 -0600
http://bitbucket.org/pypy/pypy/changeset/49b84471ada8/

Log:    One more sanity check.

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
@@ -464,7 +464,7 @@
             if (tokenvalue is not None and tokenvalue.is_constant() and
                 tokenvalue.box.getint() == vrefinfo.TOKEN_NONE):
                 forcedvalue = vref.getfield(vrefinfo.descr_forced, None)
-                if forcedvalue is not None:
+                if forcedvalue is not None and not forcedvalue.is_null():
                     self.make_equal_to(op.result, forcedvalue)
                     self.last_emitted_operation = REMOVED
                     return True
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to