archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 10:04:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8152468: PrintMiscellaneous in constantPool should use classresolve logging

Browse source 
Some instances of PrintMiscellaneous have ben replaced by classresolve logging.

Reviewed-by: coleenp, rprotacio
This commit is contained in:
Max Ockner 2016-04-11 11:33:52 -04:00
parent 18ee0a135b
commit ac0824cbad
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
hotspot/src/share/vm/oops/constantPool.cpp
View file

@ -283,8 +283,9 @@ Klass* ConstantPool::klass_at_impl(const constantPoolHandle& this_cp, int which,
this_key->record_dependency(k(), CHECK_NULL); // Can throw OOM this_key->record_dependency(k(), CHECK_NULL); // Can throw OOM
// logging for classresolve tag. // logging for classresolve tag.
trace_class_resolution(this_cp, k); if (log_is_enabled(Debug, classresolve)){
trace_class_resolution(this_cp, k);
}
this_cp->klass_at_put(which, k()); this_cp->klass_at_put(which, k());
entry = this_cp->resolved_klass_at(which); entry = this_cp->resolved_klass_at(which);
assert(entry.is_resolved() && entry.get_klass()->is_klass(), "must be resolved at this point"); assert(entry.is_resolved() && entry.get_klass()->is_klass(), "must be resolved at this point");
@ -340,9 +341,7 @@ Method* ConstantPool::method_at_if_loaded(const constantPoolHandle& cpool,
int cache_index = decode_cpcache_index(which, true); int cache_index = decode_cpcache_index(which, true);
if (!(cache_index >= 0 && cache_index < cpool->cache()->length())) { if (!(cache_index >= 0 && cache_index < cpool->cache()->length())) {
// FIXME: should be an assert // FIXME: should be an assert
if (PrintMiscellaneous && (Verbose||WizardMode)) { log_debug(classresolve)("bad operand %d in:", which); cpool->print();
tty->print_cr("bad operand %d in:", which); cpool->print();
}
return NULL; return NULL;
} }
ConstantPoolCacheEntry* e = cpool->cache()->entry_at(cache_index); ConstantPoolCacheEntry* e = cpool->cache()->entry_at(cache_index);
@ -672,10 +671,11 @@ oop ConstantPool::resolve_constant_at_impl(const constantPoolHandle& this_cp, in
int callee_index = this_cp->method_handle_klass_index_at(index); int callee_index = this_cp->method_handle_klass_index_at(index);
Symbol* name = this_cp->method_handle_name_ref_at(index); Symbol* name = this_cp->method_handle_name_ref_at(index);
Symbol* signature = this_cp->method_handle_signature_ref_at(index); Symbol* signature = this_cp->method_handle_signature_ref_at(index);
if (PrintMiscellaneous) { ResourceMark rm(THREAD);
tty->print_cr("resolve JVM_CONSTANT_MethodHandle:%d [%d/%d/%d] %s.%s", log_debug(classresolve)("resolve JVM_CONSTANT_MethodHandle:%d [%d/%d/%d] %s.%s",
ref_kind, index, this_cp->method_handle_index_at(index), ref_kind, index, this_cp->method_handle_index_at(index),
callee_index, name->as_C_string(), signature->as_C_string()); callee_index, name->as_C_string(), signature->as_C_string());
}
KlassHandle callee; KlassHandle callee;
{ Klass* k = klass_at_impl(this_cp, callee_index, true, CHECK_NULL); { Klass* k = klass_at_impl(this_cp, callee_index, true, CHECK_NULL);
callee = KlassHandle(THREAD, k); callee = KlassHandle(THREAD, k);
@ -694,10 +694,11 @@ oop ConstantPool::resolve_constant_at_impl(const constantPoolHandle& this_cp, in
case JVM_CONSTANT_MethodType: case JVM_CONSTANT_MethodType:
{ {
Symbol* signature = this_cp->method_type_signature_at(index); Symbol* signature = this_cp->method_type_signature_at(index);
if (PrintMiscellaneous) { ResourceMark rm(THREAD);
tty->print_cr("resolve JVM_CONSTANT_MethodType [%d/%d] %s", log_debug(classresolve)("resolve JVM_CONSTANT_MethodType [%d/%d] %s",
index, this_cp->method_type_index_at(index), index, this_cp->method_type_index_at(index),
signature->as_C_string()); signature->as_C_string());
}
KlassHandle klass(THREAD, this_cp->pool_holder()); KlassHandle klass(THREAD, this_cp->pool_holder());
Handle value = SystemDictionary::find_method_handle_type(signature, klass, THREAD); Handle value = SystemDictionary::find_method_handle_type(signature, klass, THREAD);
result_oop = value(); result_oop = value();

4
hotspot/test/runtime/logging/ClassResolutionTest.java
View file

@ -51,7 +51,8 @@ public class ClassResolutionTest {
}; };
public static void main(String... args) throws Exception { public static void main(String... args) throws Exception {
Thing1Handler.getThingNumber(); int x = Thing1Handler.getThingNumber();
System.out.println("ThingNumber: "+Integer.toString(x));
} }
} }
@ -62,6 +63,7 @@ public class ClassResolutionTest {
ClassResolutionTestMain.class.getName()); ClassResolutionTestMain.class.getName());
OutputAnalyzer o = new OutputAnalyzer(pb.start()); OutputAnalyzer o = new OutputAnalyzer(pb.start());
o.shouldContain("[classresolve] ClassResolutionTest$ClassResolutionTestMain$Thing1Handler ClassResolutionTest$ClassResolutionTestMain$Thing1"); o.shouldContain("[classresolve] ClassResolutionTest$ClassResolutionTestMain$Thing1Handler ClassResolutionTest$ClassResolutionTestMain$Thing1");
o.shouldContain("[classresolve] resolve JVM_CONSTANT_MethodHandle");
// (2) classresolve should turn off. // (2) classresolve should turn off.
pb = ProcessTools.createJavaProcessBuilder("-Xlog:classresolve=debug", pb = ProcessTools.createJavaProcessBuilder("-Xlog:classresolve=debug",