*** old/src/share/vm/opto/compile.cpp	Fri Sep 20 16:09:53 2013
--- new/src/share/vm/opto/compile.cpp	Fri Sep 20 16:09:52 2013

*** 652,662 ****
--- 652,662 ----
                    _late_inlines_pos(0),
                    _number_of_mh_late_inlines(0),
                    _inlining_progress(false),
                    _inlining_incrementally(false),
                    _print_inlining_list(NULL),
!                   _print_inlining_idx(0) {
    C = this;
  
    CompileWrapper cw(this);
  #ifndef PRODUCT
    if (TimeCompiler2) {

*** 677,686 ****
--- 677,688 ----
      }
    }
    set_print_assembly(print_opto_assembly);
    set_parsed_irreducible_loop(false);
  #endif
+   set_print_inlining(PrintInlining || method()->has_option("PrintInlining") NOT_PRODUCT( || PrintOptoInlining));
+   set_print_intrinsics(PrintIntrinsics || method()->has_option("PrintIntrinsics"));
  
    if (ProfileTraps) {
      // Make sure the method being compiled gets its own MDO,
      // so we can at least track the decompile_count().
      method()->ensure_method_data();

*** 708,718 ****
--- 710,720 ----
    uint estimated_size = method()->code_size()*4+64;
    estimated_size = (estimated_size < MINIMUM_NODE_HASH ? MINIMUM_NODE_HASH : estimated_size);
    PhaseGVN gvn(node_arena(), estimated_size);
    set_initial_gvn(&gvn);
  
!   if (PrintInlining  || PrintIntrinsics NOT_PRODUCT( || PrintOptoInlining)) {
!   if (print_inlining() || print_intrinsics()) {
      _print_inlining_list = new (comp_arena())GrowableArray<PrintInliningBuffer>(comp_arena(), 1, 1, PrintInliningBuffer());
    }
    { // Scope for timing the parser
      TracePhase t3("parse", &_t_parser, true);
  

*** 935,945 ****
--- 937,947 ----
      _congraph(NULL),
      _number_of_mh_late_inlines(0),
      _inlining_progress(false),
      _inlining_incrementally(false),
      _print_inlining_list(NULL),
!     _print_inlining_idx(0) {
    C = this;
  
  #ifndef PRODUCT
    TraceTime t1(NULL, &_t_totalCompilation, TimeCompiler, false);
    TraceTime t2(NULL, &_t_stubCompilation, TimeCompiler, false);

*** 3609,3619 ****
--- 3611,3621 ----
      cb.consts()->relocate((address) constant_addr, relocInfo::internal_word_type);
    }
  }
  
  void Compile::dump_inlining() {
!   if (PrintInlining || PrintIntrinsics NOT_PRODUCT( || PrintOptoInlining)) {
!   if (print_inlining() || print_intrinsics()) {
      // Print inlining message for candidates that we couldn't inline
      // for lack of space or non constant receiver
      for (int i = 0; i < _late_inlines.length(); i++) {
        CallGenerator* cg = _late_inlines.at(i);
        cg->print_inlining_late("live nodes > LiveNodeCountInliningCutoff");

*** 3633,3643 ****
--- 3635,3645 ----
          if ( m == NULL ) continue;
          useful.push(m);
        }
      }
      for (int i = 0; i < _print_inlining_list->length(); i++) {
!       tty->print(_print_inlining_list->at(i).ss()->as_string());
!       tty->print(_print_inlining_list->adr_at(i)->ss()->as_string());
      }
    }
  }
  
  int Compile::cmp_expensive_nodes(Node* n1, Node* n2) {