Skip to content
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

Jump to bottom

JBR-6746 Fix linux build failing on: "error: 'this' pointer is null" #314

Closed
wants to merge 2 commits into from
+16 −2
Closed

JBR-6746 Fix linux build failing on: "error: 'this' pointer is null" #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b2f448
JBR-6746 Fix linux build failing on: "error: 'this' pointer is null"
Feb 23, 2024
35777d6
JBR-6746 Clarify code by additional check for internal field
Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/hotspot/share/oops/fieldInfo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,13 @@ class FieldInfo {
return cp->symbol_at(index);
}

// (DCEVM) - name() duplicate for internal fields to resolve gcc compilation "nonnull" issue
Symbol* name_internal_dcevm() const {
assert(is_internal(), "internal only");
int index = name_index();
return lookup_symbol(index);
}

Symbol* signature(ConstantPool* cp) const {
int index = signature_index();
if (is_internal()) {
Expand All @@ -139,6 +146,13 @@ class FieldInfo {
return cp->symbol_at(index);
}

// (DCEVM) - signature() duplicate for internal fields to resolve gcc compilation "nonnull" issue
Symbol* signature_internal_dcevm() const {
assert(is_internal(), "internal only");
int index = signature_index();
return lookup_symbol(index);
}

void set_access_flags(u2 val) { _shorts[access_flags_offset] = val; }
void set_offset(u4 val) {
val = val << FIELDINFO_TAG_SIZE; // make room for tag
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,8 +1533,8 @@ void VM_EnhancedRedefineClasses::calculate_instance_update_information(Klass* ne
const InjectedField* const injected = JavaClasses::get_injected(old_klass->name(), &num_injected);
for (int i = java_fields_count; i < java_fields_count+num_injected; i++) {
FieldInfo *old_field = old_klass->field(i);
if (old_field->is_internal() && old_field->name(NULL) == internal_field->name(NULL)) {
copy(old_field->offset(), type2aelembytes(Signature::basic_type(internal_field->signature(NULL))));
if (old_field->is_internal() && internal_field->is_internal() && old_field->name_internal_dcevm() == internal_field->name_internal_dcevm()) {
copy(old_field->offset(), type2aelembytes(Signature::basic_type(internal_field->signature_internal_dcevm())));
if (old_field->offset() < internal_field->offset()) {
_copy_backwards = true;
}
Expand Down