commit fc519dc8f4444f6d93806ec15ce7445b322070fd
author Bill Buzbee <buzbee@google.com> Sat Mar 06 23:30:57 2010 -0800
committer Bill Buzbee <buzbee@google.com> Sun Mar 07 08:24:00 2010 -0800
tree 7128bbc741b5125cbe85300e1cd264ab3aca6bde
parent 164d1279b67ec13061e473cb453b1ff24189e0e0

Jit: Make most Jit compile failures non-fatal; just abort offending translation

Issue 2175597 Jit compile failures should abort translation, but not the VM

Added new dvmCompileAbort() to replace uses of dvmAbort() when something goes
wrong during the compliation of a trace.  In that case, we'll abort the translation
and set it's head to the interpret-only "translation".

vm/compiler/Compiler.c

diff --git a/vm/compiler/Compiler.c b/vm/compiler/Compiler.c
index 13749ac..597fbb2 100644
--- a/vm/compiler/Compiler.c
+++ b/vm/compiler/Compiler.c
@@ -479,11 +479,17 @@
                 if (gDvmJit.haltCompilerThread) {
                     LOGD("Compiler shutdown in progress - discarding request");
                 } else if (!gDvmJit.codeCacheFull) {
-                    /* If compilation failed, use interpret-template */
-                    if (!dvmCompilerDoWork(&work)) {
-                        work.result.codeAddress = gDvmJit.interpretTemplate;
+                    bool compileOK = false;
+                    jmp_buf jmpBuf;
+                    work.bailPtr = &jmpBuf;
+                    bool aborted = setjmp(jmpBuf);
+                    if (!aborted) {
+                        compileOK = dvmCompilerDoWork(&work);
                     }
-                    if (!work.result.discardResult) {
+                    if (aborted || !compileOK) {
+                        dvmCompilerArenaReset();
+                        work.result.codeAddress = gDvmJit.interpretTemplate;
+                    } else if (!work.result.discardResult) {
                         dvmJitSetCodeAddr(work.pc, work.result.codeAddress,
                                           work.result.instructionSet);
                     }