[pypy-commit] pypy guard-compatible: nonsense

cfbolz pypy.commits at gmail.com
Tue Jun 28 08:47:23 EDT 2016


Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: guard-compatible
Changeset: r85429:eedbe90f19b9
Date: 2016-06-24 18:15 +0200
http://bitbucket.org/pypy/pypy/changeset/eedbe90f19b9/

Log:	nonsense

diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -355,9 +355,10 @@
     if type == 'i':
         return NotVirtualStateInfoInt(cpu, type, info)
     if type == 'r':
-        assert isinstance(info, PtrInfo)
-        if info is not None and info._compatibility_conditions is not None:
-            return NotVirtualStateInfoPtrCompatible(cpu, type, info)
+        if info is not None:
+            if (isinstance(info, PtrInfo) and
+                    info._compatibility_conditions is not None):
+                return NotVirtualStateInfoPtrCompatible(cpu, type, info)
         return NotVirtualStateInfoPtr(cpu, type, info)
     return NotVirtualStateInfo(cpu, type, info)
 


More information about the pypy-commit mailing list