Skip to content

Cherry-pick JBR-7442 move AllowEnhancedClassRedefinition capabilities override to use sites from JBR21 #588

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
jpenilla wants to merge 1 commit into
base: jbr25
Choose a base branch
from
Open

Cherry-pick JBR-7442 move AllowEnhancedClassRedefinition capabilities override to use sites from JBR21 #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/hotspot/share/classfile/classFileParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2759,7 +2759,7 @@ static const intArray* sort_methods(Array<Method*>* methods) {
// We temporarily use the vtable_index field in the Method* to store the
// class file index, so we can read in after calling qsort.
// Put the method ordering in the shared archive.
if (JvmtiExport::can_maintain_original_method_order() || CDSConfig::is_dumping_archive()) {
if (AllowEnhancedClassRedefinition || JvmtiExport::can_maintain_original_method_order() || CDSConfig::is_dumping_archive()) {
for (int index = 0; index < length; index++) {
Method* const m = methods->at(index);
assert(!m->valid_vtable_index(), "vtable index should not be set");
Expand All @@ -2773,7 +2773,7 @@ static const intArray* sort_methods(Array<Method*>* methods) {
intArray* method_ordering = nullptr;
// If JVMTI original method ordering or sharing is enabled construct int
// array remembering the original ordering
if (JvmtiExport::can_maintain_original_method_order() || CDSConfig::is_dumping_archive()) {
if (AllowEnhancedClassRedefinition || JvmtiExport::can_maintain_original_method_order() || CDSConfig::is_dumping_archive()) {
method_ordering = new intArray(length, length, -1);
for (int index = 0; index < length; index++) {
Method* const m = methods->at(index);
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/classfile/defaultMethods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,7 @@ static void merge_in_new_methods(InstanceKlass* klass,
klass->class_loader_data(), new_size, nullptr, CHECK);

// original_ordering might be empty if this class has no methods of its own
if (JvmtiExport::can_maintain_original_method_order() || CDSConfig::is_dumping_archive()) {
if (AllowEnhancedClassRedefinition || JvmtiExport::can_maintain_original_method_order() || CDSConfig::is_dumping_archive()) {
merged_ordering = MetadataFactory::new_array<int>(
klass->class_loader_data(), new_size, CHECK);
}
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/oops/instanceKlass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4293,7 +4293,7 @@ void InstanceKlass::verify_on(outputStream* st) {
if (method_ordering() != nullptr) {
Array<int>* method_ordering = this->method_ordering();
int length = method_ordering->length();
if (JvmtiExport::can_maintain_original_method_order() ||
if (AllowEnhancedClassRedefinition || JvmtiExport::can_maintain_original_method_order() ||
((CDSConfig::is_using_archive() || CDSConfig::is_dumping_archive()) && length != 0)) {
guarantee(length == methods()->length(), "invalid method ordering length");
jlong sum = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ void JvmtiClassFileReconstituter::write_method_infos() {
}

write_u2(checked_cast<u2>(num_methods - num_overpass));
if (JvmtiExport::can_maintain_original_method_order()) {
if (AllowEnhancedClassRedefinition || JvmtiExport::can_maintain_original_method_order()) {
int index;
int original_index;
intArray method_order(num_methods, num_methods, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/prims/jvmtiManageCapabilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ void JvmtiManageCapabilities::update() {
}

JvmtiExport::set_can_get_source_debug_extension(avail.can_get_source_debug_extension);
JvmtiExport::set_can_maintain_original_method_order(AllowEnhancedClassRedefinition || avail.can_maintain_original_method_order);
JvmtiExport::set_can_maintain_original_method_order(avail.can_maintain_original_method_order);
JvmtiExport::set_can_post_interpreter_events(interp_events);
JvmtiExport::set_can_hotswap_or_post_breakpoint(
avail.can_generate_breakpoint_events ||
Expand Down