changeset 6547:0dd11a2a56c5

8043413: REGRESSION: Hotspot causes segmentation fault in jdk8ux, but not in jdk7ux Summary: long series of lambda form calls trigger stack overflow in c2 Reviewed-by: kvn, vlivanov
author roland
date Mon, 02 Jun 2014 10:01:15 +0200
parents 3533da0f7728
children c93ee08abe42 bd8c98c69d8a a98c4de4f66c
files src/share/vm/opto/bytecodeInfo.cpp
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/bytecodeInfo.cpp	Mon Jun 02 08:07:29 2014 +0200
+++ b/src/share/vm/opto/bytecodeInfo.cpp	Mon Jun 02 10:01:15 2014 +0200
@@ -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;