archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8199567: [Nestmates] Cleanup instanceKlass.cpp

Browse source 
Reviewed-by: lfoltan, coleenp
This commit is contained in:
David Holmes 2018-10-23 17:01:48 -04:00
parent 34397c4914
commit c145bd0bd0
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,25 +165,35 @@ bool InstanceKlass::has_nest_member(InstanceKlass* k, TRAPS) const {
k->external_name(), this->external_name()); k->external_name(), this->external_name());
} }
// Check names first and if they match then check actual klass. This avoids // Check for a resolved cp entry , else fall back to a name check.
// resolving anything unnecessarily. // We don't want to resolve any class other than the one being checked.
for (int i = 0; i < _nest_members->length(); i++) { for (int i = 0; i < _nest_members->length(); i++) {
int cp_index = _nest_members->at(i); int cp_index = _nest_members->at(i);
Symbol* name = _constants->klass_name_at(cp_index); if (_constants->tag_at(cp_index).is_klass()) {
if (name == k->name()) {
log_trace(class, nestmates)("- Found it at nest_members[%d] => cp[%d]", i, cp_index);
// names match so check actual klass - this may trigger class loading if
// it doesn't match (but that should be impossible)
Klass* k2 = _constants->klass_at(cp_index, CHECK_false); Klass* k2 = _constants->klass_at(cp_index, CHECK_false);
if (k2 == k) { if (k2 == k) {
log_trace(class, nestmates)("- class is listed as a nest member"); log_trace(class, nestmates)("- class is listed at nest_members[%d] => cp[%d]", i, cp_index);
return true; return true;
} else { }
// same name but different klass! }
log_trace(class, nestmates)(" - klass comparison failed!"); else {
// can't have different classes for the same name, so we're done Symbol* name = _constants->klass_name_at(cp_index);
return false; if (name == k->name()) {
log_trace(class, nestmates)("- Found it at nest_members[%d] => cp[%d]", i, cp_index);
// names match so check actual klass - this may trigger class loading if
// it doesn't match (but that should be impossible)
Klass* k2 = _constants->klass_at(cp_index, CHECK_false);
if (k2 == k) {
log_trace(class, nestmates)("- class is listed as a nest member");
return true;
}
else {
// same name but different klass!
log_trace(class, nestmates)(" - klass comparison failed!");
// can't have two names the same, so we're done
return false;
}
} }
} }
} }