Set module to Java.base before java.base is created. #2845
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hangshao0
force-pushed
the
work
branch
2 times, most recently
from
f3799fe
to
c6fca26
Compare
hangshao0
changed the title
hangshao0
changed the title
DanHeidinga
reviewed
Sep 14, 2018
runtime/vm/createramclass.cpp
Outdated
| } else { | ||
| module = javaVM->unamedModuleForSystemLoader; | ||
| } | ||
| module = javaVM->javaBaseModule; |
There was a problem hiding this comment.
Can you add a comment explaining why we chose this behaviour? Once there's a comment here I'm good with the change.
hangshao0
changed the title
DanHeidinga
reviewed
Sep 14, 2018
runtime/vm/createramclass.cpp
Outdated
| } | ||
| /* Do not assign module based on locationType, as we never set locationType for anonymous classes which led us to assign them to | ||
| * unamedModuleForSystemLoader incorrectly. Change the code to directly assign classes to Java.base here. | ||
| */ |
There was a problem hiding this comment.
This isn't quite the comment I was expecting as the situation is more broad than anonymous classes, which are correctly assigned the hostClass->module after java.base is created.
Maybe something more along the lines of:
Ignore locationType and assign all classes created before the java.base module is created to java.base.
This matches the RI implementation. Validated on JDK9 through JDK11.
Fixes eclipse-openj9#2839 Signed-off-by: hangshao <hangshao@ca.ibm.com>
DanHeidinga
approved these changes
Sep 14, 2018
|
Jenkins test sanity plinux jdk10 |
|
@DanHeidinga , seems that sanity plinux jdk10 build is not triggered. |
|
Jenkins test sanity plinux jdk10 |
|
@AdamBrousseau The PR builds don't appear to work on this PR. Any insight? |
|
Jenkins copyright check |
|
Jenkins line endings check |
|
Jenkins test sanity plinux jdk10 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2839
Signed-off-by: hangshao hangshao@ca.ibm.com