# HG changeset patch
# User kevinw
# Date 1401893096 0
# Node ID 67d80ad682bff0caa35384b1f4337031fac4a092
# Parent  73c839dda17ee80b112d73f95886a36b55d041da# Parent  4a1062dc52d15cfe0b9982a890f837fe47abb513
Merge

diff -r 4a1062dc52d1 -r 67d80ad682bf src/share/vm/opto/bytecodeInfo.cpp
--- a/src/share/vm/opto/bytecodeInfo.cpp	Wed Jun 04 06:25:53 2014 -0700
+++ b/src/share/vm/opto/bytecodeInfo.cpp	Wed Jun 04 14:44:56 2014 +0000
@@ -361,11 +361,14 @@
     set_msg("not an accessor");
     return false;
   }
+
+  // Limit inlining depth in case inlining is forced or
+  // _max_inline_level was increased to compensate for lambda forms.
+  if (inline_level() > MaxForceInlineLevel) {
+    set_msg("MaxForceInlineLevel");
+    return false;
+  }
   if (inline_level() > _max_inline_level) {
-    if (callee_method->force_inline() && inline_level() > MaxForceInlineLevel) {
-      set_msg("MaxForceInlineLevel");
-      return false;
-    }
     if (!callee_method->force_inline() || !IncrementalInline) {
       set_msg("inlining too deep");
       return false;