Jit: Fix for 2793725 SIGSEGV in JIT code cache

r7 and r8 were missing from the handler clobber set, and are stepped on by
the handlers for inline string compareto and indexof.

Change-Id: I979c4b94ee412cb3d2ab76c2421f4c2336d9b6e3

diff --git a/vm/compiler/codegen/arm/RallocUtil.c b/vm/compiler/codegen/arm/RallocUtil.c
index e357ba6..2b0af83 100644 (file)
--- a/vm/compiler/codegen/arm/RallocUtil.c
+++ b/vm/compiler/codegen/arm/RallocUtil.c
@@ -490,6 +490,8 @@ extern void dvmCompilerClobberHandlerRegs(CompilationUnit *cUnit)
     //TUNING: reduce the set of regs used by handlers.  Only a few need lots.
     dvmCompilerClobberCallRegs(cUnit);
     dvmCompilerClobber(cUnit, r4PC);
+    dvmCompilerClobber(cUnit, r7);
+    dvmCompilerClobber(cUnit, r8);
     dvmCompilerClobber(cUnit, r9);
     dvmCompilerClobber(cUnit, r10);
 }