Mercurial > hg > truffle

changeset 17819:f47fa50d9b9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8035887: VM crashes trying to force inlining the recursive call Reviewed-by: kvn, twisti
author vlivanov
date Fri, 28 Mar 2014 10:12:48 -0700
parents 75ad4240c15c
children 248ff38d2950
files src/share/vm/c1/c1_GraphBuilder.cpp src/share/vm/runtime/globals.hpp
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/c1/c1_GraphBuilder.cpp	Fri Mar 28 10:04:07 2014 -0700
+++ b/src/share/vm/c1/c1_GraphBuilder.cpp	Fri Mar 28 10:12:48 2014 -0700
@@ -3767,11 +3767,14 @@
   }
 
   // now perform tests that are based on flag settings
-  if (callee->force_inline()) {
-    if (inline_level() > MaxForceInlineLevel) INLINE_BAILOUT("MaxForceInlineLevel");
-    print_inlining(callee, "force inline by annotation");
-  } else if (callee->should_inline()) {
-    print_inlining(callee, "force inline by CompileOracle");
+  if (callee->force_inline() || callee->should_inline()) {
+    if (inline_level() > MaxForceInlineLevel                    ) INLINE_BAILOUT("MaxForceInlineLevel");
+    if (recursive_inline_level(callee) > MaxRecursiveInlineLevel) INLINE_BAILOUT("recursive inlining too deep");
+
+    const char* msg = "";
+    if (callee->force_inline())  msg = "force inline by annotation";
+    if (callee->should_inline()) msg = "force inline by CompileOracle";
+    print_inlining(callee, msg);
   } else {
     // use heuristic controls on inlining
     if (inline_level() > MaxInlineLevel                         ) INLINE_BAILOUT("inlining too deep");
--- a/src/share/vm/runtime/globals.hpp	Fri Mar 28 10:04:07 2014 -0700
+++ b/src/share/vm/runtime/globals.hpp	Fri Mar 28 10:12:48 2014 -0700
@@ -2986,7 +2986,8 @@
           "maximum number of nested recursive calls that are inlined")      \
                                                                             \
   develop(intx, MaxForceInlineLevel, 100,                                   \
-          "maximum number of nested @ForceInline calls that are inlined")   \
+          "maximum number of nested calls that are forced for inlining "    \
+          "(using CompilerOracle or marked w/ @ForceInline)")               \
                                                                             \
   product_pd(intx, InlineSmallCode,                                         \
           "Only inline already compiled methods if their code size is "     \