Author: Ronan Lamy <[email protected]>
Branch: anntype
Changeset: r80627:52d90ac2df20
Date: 2015-11-09 17:46 +0000
http://bitbucket.org/pypy/pypy/changeset/52d90ac2df20/
Log: Don't unify unrelated SomeTypes
diff --git a/rpython/annotator/binaryop.py b/rpython/annotator/binaryop.py
--- a/rpython/annotator/binaryop.py
+++ b/rpython/annotator/binaryop.py
@@ -149,12 +149,8 @@
is_type_of2 = getattr(obj2, 'is_type_of', [])
if obj1.is_immutable_constant() and obj2.is_immutable_constant() and
obj1.const == obj2.const:
result.const = obj1.const
- is_type_of = set(is_type_of1) | set(is_type_of2)
- if is_type_of:
- result.is_type_of = list(is_type_of)
- else:
- if is_type_of1 and is_type_of1 == is_type_of2:
- result.is_type_of = is_type_of1
+ if is_type_of1 and is_type_of1 == is_type_of2:
+ result.is_type_of = is_type_of1
return result
class __extend__(pairtype(SomeTypeOf, SomeTypeOf)):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
