[pypy-commit] pypy improve-ptr-conv-error: improve ptr2ptr conversion error message

[Lucas Stadler]

Author: Lucas Stadler <lstadler at imn.htwk-leipzig.de>
Branch: improve-ptr-conv-error
Changeset: r74398:2b4ef02eb621
Date: 2014-11-07 18:42 +0100
http://bitbucket.org/pypy/pypy/changeset/2b4ef02eb621/

Log:	improve ptr2ptr conversion error message

diff --git a/rpython/rtyper/rptr.py b/rpython/rtyper/rptr.py
--- a/rpython/rtyper/rptr.py
+++ b/rpython/rtyper/rptr.py
@@ -115,9 +115,9 @@
 
 class __extend__(pairtype(PtrRepr, PtrRepr)):
     def convert_from_to((r_ptr1, r_ptr2), v, llop):
-        assert r_ptr1.lowleveltype == r_ptr2.lowleveltype
-        return v
-
+        if r_ptr1.lowleveltype == r_ptr2.lowleveltype:
+            return v
+        return NotImplemented
 
 class __extend__(pairtype(PtrRepr, IntegerRepr)):