Revert "JIT: Disable inlining to work around sholes boot crash"

This reverts commit 07ecdc0b5d92099364eebdaee9aec297c4bbad72.

Random crash is confirmed to be caused by a Cortex-A8 bug. Toolchain fix is
pending and the current ToT is not triggering the crash.

(cherry-picked from dalvik-dev)

Change-Id: I12732a1fc2aa894a678bbb71e871e97f655c6814

diff --git a/vm/compiler/Frontend.c b/vm/compiler/Frontend.c
index 157bae4..8e5a5e2 100644 (file)
--- a/vm/compiler/Frontend.c
+++ b/vm/compiler/Frontend.c
@@ -877,13 +877,10 @@ bool dvmCompileTrace(JitTraceDescription *desc, int numMaxInsts,
     /* Set the instruction set to use (NOTE: later components may change it) */
     cUnit.instructionSet = dvmCompilerInstructionSet();
 
-// FIXME: temporarily disable inline [Issue 2936748]
-#if 0
     /* Inline transformation @ the MIR level */
     if (cUnit.hasInvoke && !(gDvmJit.disableOpt & (1 << kMethodInlining))) {
         dvmCompilerInlineMIR(&cUnit);
     }
-#endif
 
     /* Preparation for SSA conversion */
     dvmInitializeSSAConversion(&cUnit);