Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7
Changeset: r72321:5d850e01c23b
Date: 2014-07-02 20:53 +0200
http://bitbucket.org/pypy/pypy/changeset/5d850e01c23b/
Log: Fix
diff --git a/rpython/annotator/builtin.py b/rpython/annotator/builtin.py
--- a/rpython/annotator/builtin.py
+++ b/rpython/annotator/builtin.py
@@ -344,29 +344,6 @@
def robjmodel_keepalive_until_here(*args_s):
return immutablevalue(None)
-@analyzer_for(rpython.rtyper.lltypesystem.llmemory.cast_ptr_to_adr)
-def llmemory_cast_ptr_to_adr(s):
- from rpython.rtyper.llannotation import SomeInteriorPtr
- assert not isinstance(s, SomeInteriorPtr)
- return SomeAddress()
-
-@analyzer_for(rpython.rtyper.lltypesystem.llmemory.cast_adr_to_ptr)
-def llmemory_cast_adr_to_ptr(s, s_type):
- assert s_type.is_constant()
- return SomePtr(s_type.const)
-
-@analyzer_for(rpython.rtyper.lltypesystem.llmemory.cast_adr_to_int)
-def llmemory_cast_adr_to_int(s, s_mode=None):
- return SomeInteger() # xxx
-
-@analyzer_for(rpython.rtyper.lltypesystem.llmemory.cast_adr_to_uint_symbolic)
-def llmemory_cast_adr_to_uint_symbolic(s):
- return SomeInteger(unsigned=True)
-
-@analyzer_for(rpython.rtyper.lltypesystem.llmemory.cast_int_to_adr)
-def llmemory_cast_int_to_adr(s):
- return SomeAddress()
-
try:
import unicodedata
except ImportError:
diff --git a/rpython/rtyper/lltypesystem/llmemory.py
b/rpython/rtyper/lltypesystem/llmemory.py
--- a/rpython/rtyper/lltypesystem/llmemory.py
+++ b/rpython/rtyper/lltypesystem/llmemory.py
@@ -769,12 +769,16 @@
res = cast(lltype.Signed, res)
return res
+@analyzer_for(cast_adr_to_int)
+def ann_cast_adr_to_int(s, s_mode=None):
+ return SomeInteger() # xxx
+
def cast_adr_to_uint_symbolic(adr):
return adr._cast_to_uint()
-@analyzer_for(cast_adr_to_int)
-def ann_cast_adr_to_int(s, s_mode=None):
- return SomeInteger() # xxx
+@analyzer_for(cast_adr_to_uint_symbolic)
+def ann_cast_adr_to_uint_symbolic(s):
+ return SomeInteger(unsigned=True)
_NONGCREF = lltype.Ptr(lltype.OpaqueType('NONGCREF'))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
