Skip to content

8356390: Rename ResolvedIndyEntry::set_flags to set_has_appendix #25092

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
johan-sjolen wants to merge 6 commits into from
Closed

8356390: Rename ResolvedIndyEntry::set_flags to set_has_appendix #25092

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06816db
set_flags -> set_has_appendix
johan-sjolen May 7, 2025
beccef0
Just do the obvious thing
johan-sjolen May 9, 2025
543fee3
And make the code uniform for both flags
johan-sjolen May 9, 2025
4da8d47
We missed the case of has_appendix = false
johan-sjolen May 9, 2025
56e43e5
I should really stop pushing w/o first building
johan-sjolen May 9, 2025
f03775f
Update src/hotspot/share/oops/resolvedIndyEntry.hpp
johan-sjolen May 12, 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
20 changes: 10 additions & 10 deletions src/hotspot/share/oops/resolvedIndyEntry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ class ResolvedIndyEntry {
_flags(0) {}

// Bit shift to get flags
// Note: Only two flags exists at the moment but more could be added
enum {
has_appendix_shift = 1,
resolution_failed_shift = 0,
has_appendix_shift = 1,
};

// Getters
Expand Down Expand Up @@ -107,22 +107,22 @@ class ResolvedIndyEntry {
void fill_in(Method* m, u2 num_params, u1 return_type, bool has_appendix) {
set_num_parameters(num_params);
_return_type = return_type;
set_flags(has_appendix);
set_has_appendix(has_appendix);
// Set the method last since it is read lock free.
// Resolution is indicated by whether or not the method is set.
Atomic::release_store(&_method, m);
}

// has_appendix is currently the only other flag besides resolution_failed
void set_flags(bool has_appendix) {
u1 new_flags = (has_appendix << has_appendix_shift);
assert((new_flags & 1) == 0, "New flags should not change resolution flag");
// Preserve the resolution_failed bit
_flags = (_flags & 1) | new_flags;
void set_has_appendix(bool has_appendix) {
u1 new_flags = (has_appendix ? 1 : 0) << has_appendix_shift;
u1 old_flags = _flags & ~(1 << has_appendix_shift);
// Preserve the unaffected bits
_flags = old_flags | new_flags;
}


void set_resolution_failed() {
_flags = _flags | 1;
_flags = _flags | (1 << resolution_failed_shift);
}

void adjust_method_entry(Method* new_method) { _method = new_method; }
Expand Down