[pypy-commit] pypy arm-backend-2: fix for exception propagation

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: arm-backend-2
Changeset: r47702:c2d7db47c6d7
Date: 2011-09-22 10:49 +0200
http://bitbucket.org/pypy/pypy/changeset/c2d7db47c6d7/

Log:	fix for exception propagation

diff --git a/pypy/jit/backend/arm/assembler.py b/pypy/jit/backend/arm/assembler.py
--- a/pypy/jit/backend/arm/assembler.py
+++ b/pypy/jit/backend/arm/assembler.py
@@ -304,7 +304,7 @@
         gcrootmap = self.cpu.gc_ll_descr.gcrootmap
         mc = ARMv7Builder()
         assert self.cpu.supports_floats
-        # We need to push two registers here because we are goin to make a
+        # We need to push two registers here because we are going to make a
         # call an therefore the stack needs to be 8-byte aligned
         mc.PUSH([r.ip.value, r.lr.value])
         with saved_registers(mc, [], r.all_vfp_regs):
@@ -335,8 +335,6 @@
         self.malloc_slowpath = rawstart
 
     def propagate_memoryerror_if_r0_is_null(self):
-        if not self.propagate_exception_path:
-            return
         # see ../x86/assembler.py:propagate_memoryerror_if_eax_is_null
         self.mc.CMP_ri(r.r0.value, 0)
         self.mc.B(self.propagate_exception_path, c=c.EQ)