Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r68566:376eb896755b
Date: 2013-12-29 10:44 +0200
http://bitbucket.org/pypy/pypy/changeset/376eb896755b/
Log: merge
diff --git a/rpython/rtyper/rtyper.py b/rpython/rtyper/rtyper.py
--- a/rpython/rtyper/rtyper.py
+++ b/rpython/rtyper/rtyper.py
@@ -854,10 +854,10 @@
callee_graph = graph,
position_tag = object())
- def convertvar(self, v, r_from, r_to):
- assert isinstance(v, (Variable, Constant))
+ def convertvar(self, orig_v, r_from, r_to):
+ assert isinstance(orig_v, (Variable, Constant))
if r_from != r_to:
- v = pair(r_from, r_to).convert_from_to(v, self)
+ v = pair(r_from, r_to).convert_from_to(orig_v, self)
if v is NotImplemented:
raise TyperError("don't know how to convert from %r to %r" %
(r_from, r_to))
@@ -865,6 +865,8 @@
raise TyperError("bug in conversion from %r to %r: "
"returned a %r" % (r_from, r_to,
v.concretetype))
+ else:
+ v = orig_v
return v
def genop(self, opname, args_v, resulttype=None):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
