*** old/src/share/vm/opto/bytecodeInfo.cpp	Fri Sep 25 16:23:22 2015
--- new/src/share/vm/opto/bytecodeInfo.cpp	Fri Sep 25 16:23:21 2015

*** 106,116 ****
--- 106,116 ----
  // positive filter: should callee be inlined?
  bool InlineTree::should_inline(ciMethod* callee_method, ciMethod* caller_method,
                                 int caller_bci, ciCallProfile& profile,
                                 WarmCallInfo* wci_result) {
    // Allows targeted inlining
!   if (callee_method->should_inline()) {
!   if (C->dirset()->should_inline(callee_method)) {
      *wci_result = *(WarmCallInfo::always_hot());
      if (C->print_inlining() && Verbose) {
        CompileTask::print_inline_indent(inline_level());
        tty->print_cr("Inlined method is hot: ");
      }

*** 220,235 ****
--- 220,235 ----
      set_msg(fail_msg);
      return true;
    }
  
    // ignore heuristic controls on inlining
!   if (callee_method->should_inline()) {
!   if (C->dirset()->should_inline(callee_method)) {
      set_msg("force inline by CompileCommand");
      return false;
    }
  
!   if (callee_method->should_not_inline()) {
!   if (C->dirset()->should_not_inline(callee_method)) {
      set_msg("disallowed by CompileCommand");
      return true;
    }
  
  #ifndef PRODUCT