Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c4
Changeset: r66871:a206090d8a53
Date: 2013-09-09 19:13 +0200
http://bitbucket.org/pypy/pypy/changeset/a206090d8a53/
Log: hg merge default
diff --git a/rpython/rtyper/lltypesystem/opimpl.py
b/rpython/rtyper/lltypesystem/opimpl.py
--- a/rpython/rtyper/lltypesystem/opimpl.py
+++ b/rpython/rtyper/lltypesystem/opimpl.py
@@ -681,9 +681,7 @@
def op_raw_store(p, ofs, newvalue):
from rpython.rtyper.lltypesystem import rffi
TP = lltype.typeOf(p)
- if TP != llmemory.Address:
- assert TP == llmemory.GCREF
- p = rffi.cast(llmemory.Address, p)
+ p = rffi.cast(llmemory.Address, p)
TVAL = lltype.typeOf(newvalue)
p = rffi.cast(rffi.CArrayPtr(TVAL), p + ofs)
p[0] = newvalue
@@ -691,9 +689,7 @@
def op_raw_load(TVAL, p, ofs):
from rpython.rtyper.lltypesystem import rffi
TP = lltype.typeOf(p)
- if TP != llmemory.Address:
- assert TP == llmemory.GCREF
- p = rffi.cast(llmemory.Address, p)
+ p = rffi.cast(llmemory.Address, p)
p = rffi.cast(rffi.CArrayPtr(TVAL), p + ofs)
return p[0]
op_raw_load.need_result_type = True
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
