Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch: guard-compatible
Changeset: r86084:8bfdd10930a7
Date: 2016-08-08 18:47 +0200
http://bitbucket.org/pypy/pypy/changeset/8bfdd10930a7/
Log: make _type_issubtype function actually elidable
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
@@ -348,7 +348,7 @@
return w_res
@jit.elidable_compatible(quasi_immut_field_name_for_second_arg="version")
- def _type_issubtype(self, version, w_type):
+ def _type_issubtype(self, version, w_type, w_type_version):
from pypy.objspace.std.typeobject import _issubtype
return _issubtype(self.terminator.w_cls, w_type)
@@ -1173,7 +1173,7 @@
if map.version is not None:
version_tag = w_type.version_tag()
if version_tag is not None:
- return map._type_issubtype(w_type)
+ return map._type_issubtype(w_type, version_tag)
return space.type(w_obj).issubtype(w_type)
def mapdict_compares_by_identity(space, w_obj):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
