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

comparison src/share/vm/opto/bytecodeInfo.cpp @ 7482:989155e2d07a

Merge with hs25-b15.

author	Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date	Wed, 16 Jan 2013 01:34:24 +0100
parents	2cb439954abf d092d1b31229
children	5fc51c1ecdeb

comparison

equal deleted inserted replaced

-:6761a8f854a4
+:989155e2d07a
 _caller_jvms(caller_jvms),
 _caller_tree((InlineTree*) caller_tree),
 _method(callee),
 _site_invoke_ratio(site_invoke_ratio),
 _max_inline_level(max_inline_level),
-_count_inline_bcs(method()->code_size_for_inlining())
+_count_inline_bcs(method()->code_size_for_inlining()),
+_subtrees(c->comp_arena(), 2, 0, NULL)
 {
 NOT_PRODUCT(_count_inlines = 0;)
 if (_caller_jvms != NULL) {
 // Keep a private copy of the caller_jvms:
 _caller_jvms = new (C) JVMState(caller_jvms->method(), caller_tree->caller_jvms());
 if (!callee_method->holder()->is_initialized())           return "method holder not initialized";
 if ( callee_method->is_native())                          return "native method";
 if ( callee_method->dont_inline())                        return "don't inline by annotation";
 if ( callee_method->has_unloaded_classes_in_signature())  return "unloaded signature classes";
-if (callee_method->force_inline() || callee_method->should_inline()) {
+if (callee_method->should_inline()) {
 // ignore heuristic controls on inlining
 return NULL;
 }
 if (callee_method->should_not_inline()) {
 return "disallowed by CompilerOracle";
 }
 // Now perform checks which are heuristic
-if (callee_method->has_compiled_code() &&
+if (!callee_method->force_inline()) {
-callee_method->instructions_size() > InlineSmallCode) {
+if (callee_method->has_compiled_code() &&
+callee_method->instructions_size() > InlineSmallCode) {
 return "already compiled into a big method";
+}
 }
 // don't inline exception code unless the top method belongs to an
 // exception class
 if (caller_tree() != NULL &&
 }
 //-----------------------------try_to_inline-----------------------------------
 // return NULL if ok, reason for not inlining otherwise
 // Relocated from "InliningClosure::try_to_inline"
-const char* InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result) {
+const char* InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_method, int caller_bci, ciCallProfile& profile, WarmCallInfo* wci_result, bool& should_delay) {
 // Old algorithm had funny accumulating BC-size counters
 if (UseOldInlining && ClipInlining
 && (int)count_inline_bcs() >= DesiredMethodLimit) {
-return "size > DesiredMethodLimit";
+if (!callee_method->force_inline() || !IncrementalInline) {
+return "size > DesiredMethodLimit";
+} else if (!C->inlining_incrementally()) {
+should_delay = true;
+}
 }
 const char *msg = NULL;
 msg = should_inline(callee_method, caller_method, caller_bci, profile, wci_result);
 if (msg != NULL)
 // suppress a few checks for accessors and trivial methods
 if (callee_method->code_size() > MaxTrivialSize) {
 // don't inline into giant methods
-if (C->unique() > (uint)NodeCountInliningCutoff) {
+if (C->over_inlining_cutoff()) {
-return "NodeCountInliningCutoff";
+if ((!callee_method->force_inline() && !caller_method->is_compiled_lambda_form())
+|| !IncrementalInline) {
+return "NodeCountInliningCutoff";
+} else {
+should_delay = true;
+}
 }
 if ((!UseInterpreter || CompileTheWorld) &&
 is_init_with_ea(callee_method, caller_method, C)) {
 if (!C->do_inlining() && InlineAccessors) {
 return "not an accessor";
 }
 if (inline_level() > _max_inline_level) {
-return "inlining too deep";
+if (!callee_method->force_inline() || !IncrementalInline) {
+return "inlining too deep";
+} else if (!C->inlining_incrementally()) {
+should_delay = true;
+}
 }
 // detect direct and indirect recursive inlining
 if (!callee_method->is_compiled_lambda_form()) {
 // count the current method and the callee
 int size = callee_method->code_size_for_inlining();
 if (UseOldInlining && ClipInlining
 && (int)count_inline_bcs() + size >= DesiredMethodLimit) {
-return "size > DesiredMethodLimit";
+if (!callee_method->force_inline() || !IncrementalInline) {
+return "size > DesiredMethodLimit";
+} else if (!C->inlining_incrementally()) {
+should_delay = true;
+}
 }
 // ok, inline this method
 return NULL;
 }
 }
 //------------------------------print_inlining---------------------------------
 // Really, the failure_msg can be a success message also.
 void InlineTree::print_inlining(ciMethod* callee_method, int caller_bci, const char* failure_msg) const {
-CompileTask::print_inlining(callee_method, inline_level(), caller_bci, failure_msg ? failure_msg : "inline");
+C->print_inlining(callee_method, inline_level(), caller_bci, failure_msg ? failure_msg : "inline");
 if (callee_method == NULL)  tty->print(" callee not monotonic or profiled");
 if (Verbose && callee_method) {
 const InlineTree *top = this;
 while( top->caller_tree() != NULL ) { top = top->caller_tree(); }
 //tty->print("  bcs: %d+%d  invoked: %d", top->count_inline_bcs(), callee_method->code_size(), callee_method->interpreter_invocation_count());
 }
 }
 //------------------------------ok_to_inline-----------------------------------
-WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms, ciCallProfile& profile, WarmCallInfo* initial_wci) {
+WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms, ciCallProfile& profile, WarmCallInfo* initial_wci, bool& should_delay) {
 assert(callee_method != NULL, "caller checks for optimized virtual!");
+assert(!should_delay, "should be initialized to false");
 #ifdef ASSERT
 // Make sure the incoming jvms has the same information content as me.
 // This means that we can eventually make this whole class AllStatic.
 if (jvms->caller() == NULL) {
 assert(_caller_jvms == NULL, "redundant instance state");
 return NULL;
 }
 // Check if inlining policy says no.
 WarmCallInfo wci = *(initial_wci);
-failure_msg = try_to_inline(callee_method, caller_method, caller_bci, profile, &wci);
+failure_msg = try_to_inline(callee_method, caller_method, caller_bci, profile, &wci, should_delay);
 if (failure_msg != NULL && C->log() != NULL) {
 C->log()->inline_fail(failure_msg);
 }
 #ifndef PRODUCT

Mercurial > hg > truffle

comparison src/share/vm/opto/bytecodeInfo.cpp @ 7482:989155e2d07a