1.1 --- a/src/share/vm/ci/ciInstanceKlass.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/ci/ciInstanceKlass.cpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -292,7 +292,7 @@
1.11 // Implementation of the print method.
1.12 void ciInstanceKlass::print_impl(outputStream* st) {
1.13 ciKlass::print_impl(st);
1.14 - GUARDED_VM_ENTRY(st->print(" loader=0x%x", (address)loader());)
1.15 + GUARDED_VM_ENTRY(st->print(" loader=" INTPTR_FORMAT, p2i((address)loader()));)
1.16 if (is_loaded()) {
1.17 st->print(" loaded=true initialized=%s finalized=%s subklass=%s size=%d flags=",
1.18 bool_to_str(is_initialized()),
1.19 @@ -618,7 +618,7 @@
1.20 case T_SHORT: _out->print_cr("%d", mirror->short_field(fd->offset())); break;
1.21 case T_CHAR: _out->print_cr("%d", mirror->char_field(fd->offset())); break;
1.22 case T_INT: _out->print_cr("%d", mirror->int_field(fd->offset())); break;
1.23 - case T_LONG: _out->print_cr(INT64_FORMAT, mirror->long_field(fd->offset())); break;
1.24 + case T_LONG: _out->print_cr(INT64_FORMAT, (int64_t)(mirror->long_field(fd->offset()))); break;
1.25 case T_FLOAT: {
1.26 float f = mirror->float_field(fd->offset());
1.27 _out->print_cr("%d", *(int*)&f);
1.28 @@ -626,7 +626,7 @@
1.29 }
1.30 case T_DOUBLE: {
1.31 double d = mirror->double_field(fd->offset());
1.32 - _out->print_cr(INT64_FORMAT, *(jlong*)&d);
1.33 + _out->print_cr(INT64_FORMAT, *(int64_t*)&d);
1.34 break;
1.35 }
1.36 case T_ARRAY: {
1.37 @@ -656,7 +656,7 @@
1.38 _out->print_cr("\"");
1.39 } else {
1.40 const char* klass_name = value->klass()->name()->as_quoted_ascii();
1.41 - _out->print_cr(klass_name);
1.42 + _out->print_cr("%s", klass_name);
1.43 }
1.44 } else {
1.45 ShouldNotReachHere();
