Skip to content

8374016: [lworld] Too late checked_cast in ResolvedFieldEntry::set_flags #1844

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

Open
stefank wants to merge 3 commits into
base: lworld
Choose a base branch
from
+26 −20
Open

8374016: [lworld] Too late checked_cast in ResolvedFieldEntry::set_flags #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb25363
8374007: [lworld] Remove dead code in Symbol
stefank Dec 18, 2025
d62c04d
8374016: [lworld] Too late checked_cast in ResolvedFieldEntry::set_flags
stefank Dec 18, 2025
c700141
Merge remote-tracking branch 'valhalla/lworld' into lworld_8374016_Re…
stefank Dec 19, 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: 4 additions & 2 deletions src/hotspot/share/interpreter/interpreterRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,8 +802,10 @@ void InterpreterRuntime::resolve_get_put(Bytecodes::Code bytecode, int field_ind
}

ResolvedFieldEntry* entry = pool->resolved_field_entry_at(field_index);
entry->set_flags(info.access_flags().is_final(), info.access_flags().is_volatile(),
info.is_flat(), info.is_null_free_inline_type(),
entry->set_flags(info.access_flags().is_volatile(),
info.access_flags().is_final(),
info.is_flat(),
info.is_null_free_inline_type(),
info.has_null_marker());

entry->fill_in(info.field_holder(), info.offset(),
Expand Down
40 changes: 22 additions & 18 deletions src/hotspot/share/oops/resolvedFieldEntry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ class ResolvedFieldEntry {
ResolvedFieldEntry(0) {}

// Bit shift to get flags
// Note: Only two flags exists at the moment but more could be added
enum {
is_volatile_shift = 0,
is_final_shift = 1, // unused
Expand All @@ -91,18 +90,18 @@ class ResolvedFieldEntry {
};

// Getters
InstanceKlass* field_holder() const { return _field_holder; }
int field_offset() const { return _field_offset; }
u2 field_index() const { return _field_index; }
u2 constant_pool_index() const { return _cpool_index; }
u1 tos_state() const { return _tos_state; }
u1 get_code() const { return AtomicAccess::load_acquire(&_get_code); }
u1 put_code() const { return AtomicAccess::load_acquire(&_put_code); }
bool is_final() const { return (_flags & (1 << is_final_shift)) != 0; }
bool is_volatile () const { return (_flags & (1 << is_volatile_shift)) != 0; }
bool is_flat() const { return (_flags & (1 << is_flat_shift)) != 0; }
InstanceKlass* field_holder() const { return _field_holder; }
int field_offset() const { return _field_offset; }
u2 field_index() const { return _field_index; }
u2 constant_pool_index() const { return _cpool_index; }
u1 tos_state() const { return _tos_state; }
u1 get_code() const { return AtomicAccess::load_acquire(&_get_code); }
u1 put_code() const { return AtomicAccess::load_acquire(&_put_code); }
bool is_volatile () const { return (_flags & (1 << is_volatile_shift)) != 0; }
bool is_final() const { return (_flags & (1 << is_final_shift)) != 0; }
bool is_flat() const { return (_flags & (1 << is_flat_shift)) != 0; }
bool is_null_free_inline_type() const { return (_flags & (1 << is_null_free_inline_type_shift)) != 0; }
bool has_null_marker() const { return (_flags & (1 << has_null_marker_shift)) != 0; }
bool has_null_marker() const { return (_flags & (1 << has_null_marker_shift)) != 0; }
bool is_resolved(Bytecodes::Code code) const {
switch(code) {
case Bytecodes::_getstatic:
Expand All @@ -120,15 +119,20 @@ class ResolvedFieldEntry {
// Printing
void print_on(outputStream* st) const;

void set_flags(bool is_final_flag, bool is_volatile_flag, bool is_flat_flag, bool is_null_free_inline_type_flag,
void set_flags(bool is_volatile_flag,
bool is_final_flag,
bool is_flat_flag,
bool is_null_free_inline_type_flag,
bool has_null_marker_flag) {
u1 new_flags = ((is_final_flag ? 1 : 0) << is_final_shift) | static_cast<int>(is_volatile_flag) |
((is_flat_flag ? 1 : 0) << is_flat_shift) |
((is_null_free_inline_type_flag ? 1 : 0) << is_null_free_inline_type_shift) |
((has_null_marker_flag ? 1 : 0) << has_null_marker_shift);
int new_flags =
((is_volatile_flag ? 1 : 0) << is_volatile_shift) |
((is_final_flag ? 1 : 0) << is_final_shift) |
((is_flat_flag ? 1 : 0) << is_flat_shift) |
((is_null_free_inline_type_flag ? 1 : 0) << is_null_free_inline_type_shift) |
((has_null_marker_flag ? 1 : 0) << has_null_marker_shift);
_flags = checked_cast<u1>(new_flags);
assert(is_final() == is_final_flag, "Must be");
assert(is_volatile() == is_volatile_flag, "Must be");
assert(is_final() == is_final_flag, "Must be");
assert(is_flat() == is_flat_flag, "Must be");
assert(is_null_free_inline_type() == is_null_free_inline_type_flag, "Must be");
assert(has_null_marker() == has_null_marker_flag, "Must be");
Expand Down