Author: Armin Rigo <[email protected]>
Branch: concurrent-marksweep
Changeset: r47890:bffefba2678e
Date: 2011-10-09 13:00 +0200
http://bitbucket.org/pypy/pypy/changeset/bffefba2678e/
Log: More tweaks.
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
@@ -184,14 +184,16 @@
def op_int_add(x, y):
if not isinstance(x, (int, llmemory.AddressOffset)):
from pypy.rpython.lltypesystem import llgroup
- assert isinstance(x, llgroup.CombinedSymbolic)
+ assert isinstance(x, (llgroup.CombinedSymbolic,
+ llgroup.HighCombinedSymbolic))
assert isinstance(y, (int, llmemory.AddressOffset))
return intmask(x + y)
def op_int_sub(x, y):
if not isinstance(x, int):
from pypy.rpython.lltypesystem import llgroup
- assert isinstance(x, llgroup.CombinedSymbolic)
+ assert isinstance(x, (llgroup.CombinedSymbolic,
+ llgroup.HighCombinedSymbolic))
assert isinstance(y, int)
return intmask(x - y)
@@ -216,14 +218,16 @@
def op_int_and(x, y):
if not isinstance(x, int):
from pypy.rpython.lltypesystem import llgroup
- assert isinstance(x, llgroup.CombinedSymbolic)
+ assert isinstance(x, (llgroup.CombinedSymbolic,
+ llgroup.HighCombinedSymbolic))
assert isinstance(y, int)
return x & y
def op_int_or(x, y):
if not isinstance(x, int):
from pypy.rpython.lltypesystem import llgroup
- assert isinstance(x, llgroup.CombinedSymbolic)
+ assert isinstance(x, (llgroup.CombinedSymbolic,
+ llgroup.HighCombinedSymbolic))
assert isinstance(y, int)
return x | y
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
