--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp Tue Oct 20 13:36:20 2015 +0000
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp Tue Oct 20 18:07:28 2015 +0200
@@ -108,7 +108,7 @@
int caller_bci, ciCallProfile& profile,
WarmCallInfo* wci_result) {
// Allows targeted inlining
- if (callee_method->should_inline()) {
+ if (C->directive()->should_inline(callee_method)) {
*wci_result = *(WarmCallInfo::always_hot());
if (C->print_inlining() && Verbose) {
CompileTask::print_inline_indent(inline_level());
@@ -222,12 +222,12 @@
}
// ignore heuristic controls on inlining
- if (callee_method->should_inline()) {
+ if (C->directive()->should_inline(callee_method)) {
set_msg("force inline by CompileCommand");
return false;
}
- if (callee_method->should_not_inline()) {
+ if (C->directive()->should_not_inline(callee_method)) {
set_msg("disallowed by CompileCommand");
return true;
}