src/share/vm/interpreter/bytecodeTracer.cpp

*** 211,221 ****
        st->print_cr(" %s...[%d]", buf, len);
      } else {
        st->print_cr(" %s", buf);
      }
    } else {
!     st->print_cr(" " PTR_FORMAT, (void *)value);
    }
  }
  
  bool BytecodePrinter::check_index(int i, int& cp_index, outputStream* st) {
    ConstantPool* constants = method()->constants();
--- 211,221 ----
        st->print_cr(" %s...[%d]", buf, len);
      } else {
        st->print_cr(" %s", buf);
      }
    } else {
!     st->print_cr(" " PTR_FORMAT, p2i((void *)value));
    }
  }
  
  bool BytecodePrinter::check_index(int i, int& cp_index, outputStream* st) {
    ConstantPool* constants = method()->constants();
*** 280,290 ****
    }
  #endif //ASSERT
    if (i >= 0 && i < climit) {
      cp_index = cache->entry_at(i)->constant_pool_index();
    } else {
!     st->print_cr(" not in CP[*]?", i);
        return false;
      }
    return true;
    }
  
--- 280,290 ----
    }
  #endif //ASSERT
    if (i >= 0 && i < climit) {
      cp_index = cache->entry_at(i)->constant_pool_index();
    } else {
!     st->print_cr("%d not in CP[*]?", i);
        return false;
      }
    return true;
    }
  
*** 295,305 ****
  
    if (i >= 0 && i < constants->resolved_references()->length()) {
       cp_index = constants->object_to_cp_index(i);
       return true;
    } else {
!     st->print_cr(" not in OBJ[*]?", i);
    return false;
  }
  }
  
  
--- 295,305 ----
  
    if (i >= 0 && i < constants->resolved_references()->length()) {
       cp_index = constants->object_to_cp_index(i);
       return true;
    } else {
!     st->print_cr("%d not in OBJ[*]?", i);
    return false;
  }
  }
  
  
*** 319,329 ****
    constantTag tag = constants->tag_at(i);
  
    if (tag.is_int()) {
      st->print_cr(" " INT32_FORMAT, constants->int_at(i));
    } else if (tag.is_long()) {
!     st->print_cr(" " INT64_FORMAT, constants->long_at(i));
    } else if (tag.is_float()) {
      st->print_cr(" %f", constants->float_at(i));
    } else if (tag.is_double()) {
      st->print_cr(" %f", constants->double_at(i));
    } else if (tag.is_string()) {
--- 319,329 ----
    constantTag tag = constants->tag_at(i);
  
    if (tag.is_int()) {
      st->print_cr(" " INT32_FORMAT, constants->int_at(i));
    } else if (tag.is_long()) {
!     st->print_cr(" " INT64_FORMAT, (int64_t)(constants->long_at(i)));
    } else if (tag.is_float()) {
      st->print_cr(" %f", constants->float_at(i));
    } else if (tag.is_double()) {
      st->print_cr(" %f", constants->double_at(i));
    } else if (tag.is_string()) {
*** 338,348 ****
      st->print(" <MethodType> %d", i2);
      print_symbol(constants->symbol_at(i2), st);
    } else if (tag.is_method_handle()) {
      int kind = constants->method_handle_ref_kind_at(i);
      int i2 = constants->method_handle_index_at(i);
!     st->print(" <MethodHandle of kind %d>", kind, i2);
      print_field_or_method(-i, i2, st);
    } else {
      st->print_cr(" bad tag=%d at %d", tag.value(), i);
    }
  }
--- 338,348 ----
      st->print(" <MethodType> %d", i2);
      print_symbol(constants->symbol_at(i2), st);
    } else if (tag.is_method_handle()) {
      int kind = constants->method_handle_ref_kind_at(i);
      int i2 = constants->method_handle_index_at(i);
!     st->print(" <MethodHandle of kind %d index at %d>", kind, i2);
      print_field_or_method(-i, i2, st);
    } else {
      st->print_cr(" bad tag=%d at %d", tag.value(), i);
    }
  }
*** 387,396 ****
--- 387,397 ----
      st->print_cr(" %d <%s%s%s>", i, name->as_C_string(), sep, signature->as_C_string());
    }
  }
  
  
+ PRAGMA_FORMAT_NONLITERAL_IGNORED_EXTERNAL
  void BytecodePrinter::print_attributes(int bci, outputStream* st) {
    // Show attributes of pre-rewritten codes
    Bytecodes::Code code = Bytecodes::java_code(raw_code());
    // If the code doesn't have any fields there's nothing to print.
    // note this is ==1 because the tableswitch and lookupswitch are
*** 513,523 ****
--- 514,527 ----
          int first = true;
          for (int ll = lo; ll <= hi; ll++, first = false)  {
            int idx = ll - lo;
            const char *format = first ? " %d:" INT32_FORMAT " (delta: %d)" :
                                         ", %d:" INT32_FORMAT " (delta: %d)";
+ PRAGMA_DIAG_PUSH
+ PRAGMA_FORMAT_NONLITERAL_IGNORED_INTERNAL
            st->print(format, ll, dest[idx], dest[idx]-bci);
+ PRAGMA_DIAG_POP
          }
          st->cr();
        }
        break;
      case Bytecodes::_lookupswitch:
*** 533,543 ****
--- 537,550 ----
          st->print(" %d %d ", default_dest, len);
          bool first = true;
          for (int ll = 0; ll < len; ll++, first = false)  {
            const char *format = first ? " " INT32_FORMAT ":" INT32_FORMAT :
                                         ", " INT32_FORMAT ":" INT32_FORMAT ;
+ PRAGMA_DIAG_PUSH
+ PRAGMA_FORMAT_NONLITERAL_IGNORED_INTERNAL
            st->print(format, key[ll], dest[ll]);
+ PRAGMA_DIAG_POP
          }
          st->cr();
        }
        break;