truffle: src/share/vm/opto/bytecodeInfo.cpp comparison

6552561: MaxRecursiveInlineLevel flag doesn't operate correctly Reviewed-by: kvn, never

comparison

equal deleted inserted replaced

-:ae93231c7a1f
+:b21ecca7ccc4
 }
 if( inline_depth() > MaxInlineLevel ) {
 return "inlining too deep";
 }
-// We need to detect recursive inlining of method handle targets: if
+// detect direct and indirect recursive inlining
-// the current method is a method handle adapter and one of the
+{
-// callers is the same method as the callee, we bail out if
+// count the current method and the callee
-// MaxRecursiveInlineLevel is hit.
+int inline_level = (method() == callee_method) ? 1 : 0;
-if (method()->is_method_handle_adapter()) {
+if (inline_level > MaxRecursiveInlineLevel)
+return "recursively inlining too deep";
+// count callers of current method and callee
 JVMState* jvms = caller_jvms();
-int inline_level = 0;
 while (jvms != NULL && jvms->has_method()) {
 if (jvms->method() == callee_method) {
 inline_level++;
 if (inline_level > MaxRecursiveInlineLevel)
 return "recursively inlining too deep";
 }
 jvms = jvms->caller();
 }
-}
-if (method() == callee_method && inline_depth() > MaxRecursiveInlineLevel) {
-return "recursively inlining too deep";
 }
 int size = callee_method->code_size();
 if (UseOldInlining && ClipInlining

Mercurial > hg > truffle