archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-16 17:14:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8293304: Replace some usages of INTPTR_FORMAT with PTR_FORMAT

Browse source 
Reviewed-by: kbarrett, coleenp
This commit is contained in:
Stefan Karlsson 2022-09-08 13:37:06 +00:00
parent 98da03af50
commit 6bd2794175
41 changed files with 137 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/hotspot/share/oops/instanceKlass.cpp
View file

@ -1355,7 +1355,7 @@ instanceOop InstanceKlass::register_finalizer(instanceOop i, TRAPS) {
if (TraceFinalizerRegistration) {
tty->print("Registered ");
i->print_value_on(tty);
tty->print_cr(" (" INTPTR_FORMAT ") as finalizable", p2i(i));
tty->print_cr(" (" PTR_FORMAT ") as finalizable", p2i(i));
}
instanceHandle h_i(THREAD, i);
// Pass the handle as argument, JavaCalls::call expects oop as jobjects
@ -1475,7 +1475,7 @@ void InstanceKlass::call_class_initializer(TRAPS) {
LogStream ls(lt);
ls.print("%d Initializing ", call_class_initializer_counter++);
name()->print_value_on(&ls);
ls.print_cr("%s (" INTPTR_FORMAT ")", h_method() == NULL ? "(no method)" : "", p2i(this));
ls.print_cr("%s (" PTR_FORMAT ")", h_method() == NULL ? "(no method)" : "", p2i(this));
}
if (h_method() != NULL) {
JavaCallArguments args; // No arguments
@ -2040,7 +2040,7 @@ PrintClassClosure::PrintClassClosure(outputStream* st, bool verbose)
void PrintClassClosure::do_klass(Klass* k) {
ResourceMark rm;
// klass pointer
_st->print(INTPTR_FORMAT " ", p2i(k));
_st->print(PTR_FORMAT " ", p2i(k));
// klass size
_st->print("%4d ", k->size());
// initialization state
@ -2675,7 +2675,7 @@ void InstanceKlass::unload_class(InstanceKlass* ik) {
if (log_is_enabled(Info, class, unload)) {
ResourceMark rm;
log_info(class, unload)("unloading class %s " INTPTR_FORMAT, ik->external_name(), p2i(ik));
log_info(class, unload)("unloading class %s " PTR_FORMAT, ik->external_name(), p2i(ik));
}
Events::log_class_unloading(Thread::current(), ik);
@ -3504,9 +3504,9 @@ void InstanceKlass::print_on(outputStream* st) const {
} else {
st->print_cr(BULLET"java mirror: NULL");
}
st->print(BULLET"vtable length %d (start addr: " INTPTR_FORMAT ")", vtable_length(), p2i(start_of_vtable())); st->cr();
st->print(BULLET"vtable length %d (start addr: " PTR_FORMAT ")", vtable_length(), p2i(start_of_vtable())); st->cr();
if (vtable_length() > 0 && (Verbose || WizardMode)) print_vtable(start_of_vtable(), vtable_length(), st);
st->print(BULLET"itable length %d (start addr: " INTPTR_FORMAT ")", itable_length(), p2i(start_of_itable())); st->cr();
st->print(BULLET"itable length %d (start addr: " PTR_FORMAT ")", itable_length(), p2i(start_of_itable())); st->cr();
if (itable_length() > 0 && (Verbose || WizardMode)) print_vtable(start_of_itable(), itable_length(), st);
st->print_cr(BULLET"---- static fields (%d words):", static_field_size());
FieldPrinter print_static_field(st);
@ -3713,7 +3713,7 @@ void InstanceKlass::print_class_load_logging(ClassLoaderData* loader_data,
stringStream debug_stream;
// Class hierarchy info
debug_stream.print(" klass: " INTPTR_FORMAT " super: " INTPTR_FORMAT,
debug_stream.print(" klass: " PTR_FORMAT " super: " PTR_FORMAT,
p2i(this), p2i(superklass()));
// Interfaces
@ -3721,7 +3721,7 @@ void InstanceKlass::print_class_load_logging(ClassLoaderData* loader_data,
debug_stream.print(" interfaces:");
int length = local_interfaces()->length();
for (int i = 0; i < length; i++) {
debug_stream.print(" " INTPTR_FORMAT,
debug_stream.print(" " PTR_FORMAT,
p2i(InstanceKlass::cast(local_interfaces()->at(i))));
}
}
@ -4004,7 +4004,7 @@ void InstanceKlass::purge_previous_version_list() {
// The previous version InstanceKlass is on the ClassLoaderData deallocate list
// so will be deallocated during the next phase of class unloading.
log_trace(redefine, class, iklass, purge)
("previous version " INTPTR_FORMAT " is dead.", p2i(pv_node));
("previous version " PTR_FORMAT " is dead.", p2i(pv_node));
// Unlink from previous version list.
assert(pv_node->class_loader_data() == loader_data, "wrong loader_data");
InstanceKlass* next = pv_node->previous_versions();
@ -4018,7 +4018,7 @@ void InstanceKlass::purge_previous_version_list() {
version++;
continue;
} else {
log_trace(redefine, class, iklass, purge)("previous version " INTPTR_FORMAT " is alive", p2i(pv_node));
log_trace(redefine, class, iklass, purge)("previous version " PTR_FORMAT " is alive", p2i(pv_node));
assert(pvcp->pool_holder() != NULL, "Constant pool with no holder");
guarantee (!loader_data->is_unloading(), "unloaded classes can't be on the stack");
live_count++;