src/share/vm/runtime/compilationPolicy.cpp

*** 168,178 ****
  }
  
  void NonTieredCompPolicy::trace_osr_completion(nmethod* osr_nm) {
    if (TraceOnStackReplacement) {
      if (osr_nm == NULL) tty->print_cr("compilation failed");
!     else tty->print_cr("nmethod " INTPTR_FORMAT, osr_nm);
    }
  }
  #endif // !PRODUCT
  
  void NonTieredCompPolicy::initialize() {
--- 168,178 ----
  }
  
  void NonTieredCompPolicy::trace_osr_completion(nmethod* osr_nm) {
    if (TraceOnStackReplacement) {
      if (osr_nm == NULL) tty->print_cr("compilation failed");
!     else tty->print_cr("nmethod " INTPTR_FORMAT, p2i(osr_nm));
    }
  }
  #endif // !PRODUCT
  
  void NonTieredCompPolicy::initialize() {
*** 415,424 ****
--- 415,425 ----
    }
    return NULL;
  }
  
  #ifndef PRODUCT
+ PRAGMA_FORMAT_NONLITERAL_IGNORED_EXTERNAL
  void NonTieredCompPolicy::trace_frequency_counter_overflow(methodHandle m, int branch_bci, int bci) {
    if (TraceInvocationCounterOverflow) {
      MethodCounters* mcs = m->method_counters();
      assert(mcs != NULL, "MethodCounters cannot be NULL for profiling");
      InvocationCounter* ic = mcs->invocation_counter();
*** 426,436 ****
--- 427,440 ----
      ResourceMark rm;
      const char* msg =
        bci == InvocationEntryBci
        ? "comp-policy cntr ovfl @ %d in entry of "
        : "comp-policy cntr ovfl @ %d in loop of ";
+ PRAGMA_DIAG_PUSH
+ PRAGMA_FORMAT_NONLITERAL_IGNORED_INTERNAL
      tty->print(msg, bci);
+ PRAGMA_DIAG_POP
      m->print_value();
      tty->cr();
      ic->print();
      bc->print();
      if (ProfileInterpreter) {
*** 501,520 ****
      assert(fr.interpreter_frame_method() == m(), "bad method");
  
      if (TraceCompilationPolicy) {
        tty->print("method invocation trigger: ");
        m->print_short_name(tty);
!       tty->print(" ( interpreted " INTPTR_FORMAT ", size=%d ) ", (address)m(), m->code_size());
      }
      RegisterMap reg_map(thread, false);
      javaVFrame* triggerVF = thread->last_java_vframe(&reg_map);
      // triggerVF is the frame that triggered its counter
      RFrame* first = new InterpretedRFrame(triggerVF->fr(), thread, m);
  
      if (first->top_method()->code() != NULL) {
        // called obsolete method/nmethod -- no need to recompile
!       if (TraceCompilationPolicy) tty->print_cr(" --> " INTPTR_FORMAT, first->top_method()->code());
      } else {
        if (TimeCompilationPolicy) accumulated_time()->start();
        GrowableArray<RFrame*>* stack = new GrowableArray<RFrame*>(50);
        stack->push(first);
        RFrame* top = findTopInlinableFrame(stack);
--- 505,524 ----
      assert(fr.interpreter_frame_method() == m(), "bad method");
  
      if (TraceCompilationPolicy) {
        tty->print("method invocation trigger: ");
        m->print_short_name(tty);
!       tty->print(" ( interpreted " INTPTR_FORMAT ", size=%d ) ", p2i((address)m()), m->code_size());
      }
      RegisterMap reg_map(thread, false);
      javaVFrame* triggerVF = thread->last_java_vframe(&reg_map);
      // triggerVF is the frame that triggered its counter
      RFrame* first = new InterpretedRFrame(triggerVF->fr(), thread, m);
  
      if (first->top_method()->code() != NULL) {
        // called obsolete method/nmethod -- no need to recompile
!       if (TraceCompilationPolicy) tty->print_cr(" --> " INTPTR_FORMAT, p2i(first->top_method()->code()));
      } else {
        if (TimeCompilationPolicy) accumulated_time()->start();
        GrowableArray<RFrame*>* stack = new GrowableArray<RFrame*>(50);
        stack->push(first);
        RFrame* top = findTopInlinableFrame(stack);
*** 638,648 ****
      }
  
      if (TraceCompilationPolicy && Verbose) {
        tty->print("\n\t     check caller: ");
        next_m->print_short_name(tty);
!       tty->print(" ( interpreted " INTPTR_FORMAT ", size=%d ) ", (address)next_m(), next_m->code_size());
      }
  
      current = next;
    }
  
--- 642,652 ----
      }
  
      if (TraceCompilationPolicy && Verbose) {
        tty->print("\n\t     check caller: ");
        next_m->print_short_name(tty);
!       tty->print(" ( interpreted " INTPTR_FORMAT ", size=%d ) ", p2i((address)next_m()), next_m->code_size());
      }
  
      current = next;
    }