[pypy-commit] pypy default: fix for _write_barrier_fastpath, missing a check to select the correct slowpath helper

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r63306:9e042c93925f
Date: 2013-04-13 14:30 +0200
http://bitbucket.org/pypy/pypy/changeset/9e042c93925f/

Log:	fix for _write_barrier_fastpath, missing a check to select the
	correct slowpath helper

diff --git a/rpython/jit/backend/arm/opassembler.py b/rpython/jit/backend/arm/opassembler.py
--- a/rpython/jit/backend/arm/opassembler.py
+++ b/rpython/jit/backend/arm/opassembler.py
@@ -630,7 +630,9 @@
         # argument the address of the structure we are writing into
         # (the first argument to COND_CALL_GC_WB).
         helper_num = card_marking
-        if self._regalloc is not None and self._regalloc.vfprm.reg_bindings:
+        if is_frame:
+            helper_num = 4
+        elif self._regalloc is not None and self._regalloc.vfprm.reg_bindings:
             helper_num += 2
         if self.wb_slowpath[helper_num] == 0:    # tests only
             assert not we_are_translated()