Merging 7888.

diff --combined src/vm/jit/jit.c
index 291fb1fe79206256b0673befdf5f3e0b5fec76ea,40ff40fe7ad74f6a6ed18e58466c73fe23fc04e0..c1b348950f12607f9b69c490f443b46a0bc18c4c
--- 1/src/vm/jit/jit.c
--- 2/src/vm/jit/jit.c
+++ b/src/vm/jit/jit.c
@@@ -176,6 -176,8 +176,8 @@@ icmdtable_entry_t icmd_table[256] = 
  
  void jit_init(void)
  {
+       TRACESUBSYSTEMINITIALIZATION("jit_init");
+ 
  #if defined(ENABLE_JIT)
        /* initialize stack analysis subsystem */
  
@@@ -375,7 -377,7 +377,7 @@@ u1 *jit_compile(methodinfo *m
  #endif
  
  #if defined(ENABLE_INLINING) && defined(ENABLE_INLINING_DEBUG)
-       if (opt_inlining && opt_inline_debug_all)
+       if (opt_Inline && opt_InlineAll)
                jd->flags |= JITDATA_FLAG_INLINE;
  #endif
  
@@@ -389,7 -391,7 +391,7 @@@
                jd->flags |= JITDATA_FLAG_VERBOSECALL;
  
  #if defined(ENABLE_REPLACEMENT) && defined(ENABLE_INLINING)
-       if (opt_inlining)
+       if (opt_Inline)
                jd->flags |= JITDATA_FLAG_COUNTDOWN;
  #endif
  
@@@ -513,7 -515,7 +515,7 @@@ u1 *jit_recompile(methodinfo *m
                jd->flags |= JITDATA_FLAG_VERBOSECALL;
  
  #if defined(ENABLE_INLINING)
-       if (opt_inlining)
+       if (opt_Inline)
                jd->flags |= JITDATA_FLAG_INLINE;
  #endif
  
@@@ -762,12 -764,12 +764,12 @@@ static u1 *jit_compile_intern(jitdata *
  # endif /* defined(ENABLE_LSRA) && !defined(ENABLE_SSA) */
  #if defined(ENABLE_SSA)
                /* allocate registers */
 -              if ((opt_lsra) && (jd->exceptiontablelength == 0)) {
 +              if ((opt_lsra) /*&& strcmp(jd->m->name->text, "findClass") != 0*/) {
                        jd->ls = DNEW(lsradata);
                        jd->ls = NULL;
                        ssa(jd);
                        /*lsra(jd);*/ regalloc(jd);
 -
 +                      eliminate_subbasicblocks(jd);
                        STATISTICS(count_methods_allocated_by_lsra++);
  
                } else