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

8260009: InstanceKlass::has_as_permitted_subclass() fails if subclass was redefined

Browse source 
Reviewed-by: lfoltan, sspitsyn, dholmes
This commit is contained in:
Harold Seigel 2021-01-22 13:52:05 +00:00
parent 7ed8ba1ca0
commit f928265e81
2 changed files with 134 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -250,23 +250,12 @@ bool InstanceKlass::has_as_permitted_subclass(const InstanceKlass* k) const {
return false;
}
// Check for a resolved cp entry, else fall back to a name check.
// We don't want to resolve any class other than the one being checked.
for (int i = 0; i < _permitted_subclasses->length(); i++) {
int cp_index = _permitted_subclasses->at(i);
if (_constants->tag_at(cp_index).is_klass()) {
Klass* k2 = _constants->klass_at(cp_index, THREAD);
assert(!HAS_PENDING_EXCEPTION, "Unexpected exception");
if (k2 == k) {
log_trace(class, sealed)("- class is listed at permitted_subclasses[%d] => cp[%d]", i, cp_index);
return true;
}
} else {
Symbol* name = _constants->klass_name_at(cp_index);
if (name == k->name()) {
log_trace(class, sealed)("- Found it at permitted_subclasses[%d] => cp[%d]", i, cp_index);
return true;
}
Symbol* name = _constants->klass_name_at(cp_index);
if (name == k->name()) {
log_trace(class, sealed)("- Found it at permitted_subclasses[%d] => cp[%d]", i, cp_index);
return true;
}
}
log_trace(class, sealed)("- class is NOT a permitted subclass!");