[pypy-commit] pypy default: Merged in hey_lu/pypy/improve-ptr-conv-error (pull request #290)

[arigo]

Author: Armin Rigo <armin.rigo at gmail.com>
Branch: 
Changeset: r74399:3742fe206a81
Date: 2014-11-08 11:36 +0100
http://bitbucket.org/pypy/pypy/changeset/3742fe206a81/

Log:	Merged in hey_lu/pypy/improve-ptr-conv-error (pull request #290)

	Improve ptr2ptr conversion error

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)):