Commits

Armin Rigo committed bffefba

More tweaks.

  • Participants
  • Parent commits 31f8caa
  • Branches concurrent-marksweep

Comments (0)

Files changed (1)

File pypy/rpython/lltypesystem/opimpl.py

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