Mercurial > hg > truffle

changeset 17967:67d80ad682bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kevinw
date Wed, 04 Jun 2014 14:44:56 +0000
parents 73c839dda17e (diff) 4a1062dc52d1 (current diff)
children 81d8fccbab0b
files
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;