Author: Armin Rigo <ar...@tunes.org>
Branch: 32ptr-on-64bit
Changeset: r51661:27de83186d13
Date: 2012-01-22 20:20 +0100
http://bitbucket.org/pypy/pypy/changeset/27de83186d13/
Log: fix.
diff --git a/pypy/rpython/lltypesystem/opimpl.py
b/pypy/rpython/lltypesystem/opimpl.py
--- a/pypy/rpython/lltypesystem/opimpl.py
+++ b/pypy/rpython/lltypesystem/opimpl.py
@@ -622,14 +622,14 @@
return lltype.cast_opaque_ptr(llmemory.HiddenGcRef32, ptr)
def op_show_from_ptr32(RESTYPE, ptr32):
- if not ptr32:
- return lltype.nullptr(RESTYPE.TO)
if RESTYPE == llmemory.Address:
if not ptr32:
return llmemory.NULL
PTRTYPE = lltype.Ptr(ptr32._obj.container._TYPE)
ptr = lltype.cast_opaque_ptr(PTRTYPE, ptr32)
return llmemory.cast_ptr_to_adr(ptr)
+ if not ptr32:
+ return lltype.nullptr(RESTYPE.TO)
if isinstance(RESTYPE.TO, lltype.GcOpaqueType):
try:
ptr32 = ptr32._obj.container._as_ptr()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
