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

Fix Nesthost constant pool entry type #2898

Merged
merged 1 commit into from
Sep 17, 2018
Merged

Fix Nesthost constant pool entry type #2898

merged 1 commit into from
Sep 17, 2018

Conversation

fengxue-IS
Copy link
Contributor

  • Use CFR_CONSTANT_Class instead of CFR_CONSTANT_UTF8

Close: #2708

Signed-off-by: Jack Lu Jack.S.Lu@ibm.com

@fengxue-IS
Fix Nesthost constant pool entry type
6e3fa7e 
- Use CFR_CONSTANT_Class instead of CFR_CONSTANT_UTF8

Signed-off-by: Jack Lu <Jack.S.Lu@ibm.com>
@fengxue-IS
Copy link
Contributor Author

@pshipton can you review this?

@DanHeidinga
Copy link
Member

DanHeidinga commented Sep 17, 2018 •
edited
Loading

Does need to change as well https://github.com/eclipse/openj9/blob/6e3fa7ee45bd6b1fc0d6831be5de2b428e3a03d1/runtime/bcutil/ClassFileWriter.cpp#L134

Edit: the actual code, one line down from that, already records it as a class type. Ignore this question

DanHeidinga
DanHeidinga approved these changes Sep 17, 2018
View reviewed changes
Copy link
Member

@DanHeidinga DanHeidinga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@DanHeidinga
Copy link
Member

Jenkins test extended xlinux jdk11

@DanHeidinga DanHeidinga self-assigned this Sep 17, 2018
@fengxue-IS
Copy link
Contributor Author

fengxue-IS commented Sep 17, 2018 •
edited
Loading

Does

openj9/runtime/bcutil/ClassFileWriter.cpp

Line 134 in 6e3fa7e

addEntry((void *) &NEST_HOST, 0, CFR_CONSTANT_Utf8);
need to change as well?

no, that line adds the Nesthost attribute name string to the constant pool

@pshipton pshipton added this to the Release 0.10.0 milestone Sep 17, 2018
@DanHeidinga
Copy link
Member

Despite the build failures, this fixes the JVMCFRE145 Nest host must be a constant class error

@DanHeidinga DanHeidinga merged commit 0870483 into eclipse-openj9:master Sep 17, 2018
@DanHeidinga DanHeidinga mentioned this pull request Sep 18, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DanHeidinga DanHeidinga DanHeidinga approved these changes

Assignees

@DanHeidinga DanHeidinga

Labels
comp:vm jdk11
Projects
None yet
Milestone
Release 0.10.0
Development

Successfully merging this pull request may close these issues.
3 participants
@fengxue-IS @DanHeidinga @pshipton