Skip to content

8366498: Simplify ClassFileParser::parse_super_class #27026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

8366498: Simplify ClassFileParser::parse_super_class #27026

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d353bfe
8366498: Wrong InstanceKlass::cast() in ClassFileParser::parse_super_…
iklam Sep 1, 2025
dec4af7
Simplify parse_super_klass() -> check_super_class()
iklam Sep 1, 2025
256716f
removed test-only assert
iklam Sep 1, 2025
8390278
@coleenp review - updated asserts
iklam Sep 4, 2025
4422804
Merge branch 'master' into 8366498-wrong-instance-klass-cast-in-parse…
iklam Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/hotspot/share/classfile/classFileParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3808,7 +3808,7 @@ const InstanceKlass* ClassFileParser::parse_super_class(ConstantPool* const cp,
const bool need_verify,
TRAPS) {
assert(cp != nullptr, "invariant");
const InstanceKlass* super_klass = nullptr;
const Klass* super_klass = nullptr;

if (super_class_index == 0) {
guarantee_property(_class_name == vmSymbols::java_lang_Object(),
Expand All @@ -3824,7 +3824,7 @@ const InstanceKlass* ClassFileParser::parse_super_class(ConstantPool* const cp,
// However, make sure it is not an array type.
bool is_array = false;
if (cp->tag_at(super_class_index).is_klass()) {
super_klass = InstanceKlass::cast(cp->resolved_klass_at(super_class_index));
super_klass = cp->resolved_klass_at(super_class_index);
if (need_verify)
is_array = super_klass->is_array_klass();
} else if (need_verify) {
Expand All @@ -3835,7 +3835,7 @@ const InstanceKlass* ClassFileParser::parse_super_class(ConstantPool* const cp,
"Bad superclass name in class file %s", CHECK_NULL);
}
}
return super_klass;
return super_klass == nullptr ? nullptr : InstanceKlass::cast(super_klass);
}

OopMapBlocksBuilder::OopMapBlocksBuilder(unsigned int max_blocks) {
Expand Down