[pypy-commit] pypy guard-compatible: nonsense

[cfbolz]

Author: Carl Friedrich Bolz 
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)
 
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy guard-compatible: nonsense

[cfbolz]

Author: Carl Friedrich Bolz 
Branch: guard-compatible
Changeset: r83430:20a9a53c287b
Date: 2016-03-29 17:53 +0200
http://bitbucket.org/pypy/pypy/changeset/20a9a53c287b/

Log:nonsense

diff --git a/pypy/objspace/std/mapdict.py b/pypy/objspace/std/mapdict.py
--- a/pypy/objspace/std/mapdict.py
+++ b/pypy/objspace/std/mapdict.py
@@ -101,9 +101,9 @@
 the object does *not* have a devolved terminator, and -2 if the
 terminator *is* devolved """
 attr = self.find_map_attr(name, index)
-if isinstance(self.terminator, DevolvedDictTerminator):
-return NOATTR_DEVOLVED_TERMINATOR
 if attr is None:
+if isinstance(self.terminator, DevolvedDictTerminator):
+return NOATTR_DEVOLVED_TERMINATOR
 return NOATTR
 return attr.storageindex
 
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy guard-compatible: nonsense

[cfbolz]

Author: Carl Friedrich Bolz 
Branch: guard-compatible
Changeset: r83071:24d702fa2df4
Date: 2016-03-15 15:02 +0100
http://bitbucket.org/pypy/pypy/changeset/24d702fa2df4/

Log:nonsense

diff --git a/pypy/objspace/std/mapdict.py b/pypy/objspace/std/mapdict.py
--- a/pypy/objspace/std/mapdict.py
+++ b/pypy/objspace/std/mapdict.py
@@ -129,7 +129,7 @@
 def length(self):
 raise NotImplementedError("abstract base class")
 
-@jit.guard_compatible()
+@jit.elidable_compatible()
 def _length_larger_than(self, n):
 return self.length() > n
 
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit