[pypy-commit] pypy stmgc-c4: bah

[Raemi]

Author: Remi Meier <remi.meier at gmail.com>
Branch: stmgc-c4
Changeset: r65689:fc056395b86d
Date: 2013-07-26 14:17 +0200
http://bitbucket.org/pypy/pypy/changeset/fc056395b86d/

Log:	bah

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -2204,7 +2204,6 @@
         assert isinstance(descr, STMBarrierDescr)
         assert descr.returns_modified_object
         loc_base = arglocs[0]
-        temp_loc = arglocs[1]
         assert isinstance(loc_base, RegLoc)
         
         helper_num = 0
@@ -2247,6 +2246,8 @@
         if isinstance(descr, STMReadBarrierDescr):
             # calculate: temp = obj & FX_MASK
             assert StmGC.FX_MASK == 65535
+            assert not is_frame
+            temp_loc = arglocs[1] # does not exist if is_frame!
             mc.MOVZX16(temp_loc, loc_base)
             # calculate: rbc + temp == obj
             rbc = self._get_stm_read_barrier_cache_addr()