fix lookup of jvmci and compiler sources im JDK src.zip #2680
Conversation
This file contains hidden or 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
zakkak
reviewed
Jul 15, 2020
.../src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
Outdated
Show resolved
Hide resolved
zakkak
reviewed
Jul 15, 2020
...tratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceManager.java
Outdated
Show resolved
Hide resolved
olpaw
reviewed
Jul 17, 2020
|
|
||
| @Override | ||
| public Path checkCacheFile(Path filePath) { | ||
| if (!isJDK8()) { |
Member
There was a problem hiding this comment.
Use JavaVersionUtil.JAVA_SPEC >= 11 (like elsewhere)
olpaw
reviewed
Jul 17, 2020
|
|
||
| @Override | ||
| public Path tryCacheFile(Path filePath) { | ||
| if (!isJDK8()) { |
Member
There was a problem hiding this comment.
olpaw
reviewed
Jul 17, 2020
| */ | ||
| private static String javaSpecVersion = System.getProperty(JAVA_SPEC_VERSION_PROP); | ||
|
|
||
| public static boolean isJDK8() { |
olpaw
reviewed
Jul 17, 2020
...tratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceManager.java
Outdated
Show resolved
Hide resolved
olpaw
reviewed
Jul 17, 2020
| * A whitelist of packages prefixes used to pre-filter JDK runtime class lookups. | ||
| * An accept list of packages prefixes used to pre-filter JDK11+ runtime class lookups. | ||
| */ | ||
| public static final String[] JDK_SRC_PACKAGE_PREFIXES = { |
Member
There was a problem hiding this comment.
JDK_SRC_PACKAGE_PREFIXES = Stream.concat(Stream.of(JDK8_SRC_PACKAGE_PREFIXES), Stream.of("org.graalvm.compiler")).toArray(String[]::new);
olpaw
requested changes
Jul 17, 2020
Member
olpaw
left a comment
olpaw
left a comment
There was a problem hiding this comment.
Looks good. Please fix the little things. I should be able to get to merging early next week.
Thanks!
Collaborator
Author
|
Hi Paul, Thanks for the review. I have made all changes as requested. |
olpaw
approved these changes
Jul 17, 2020
Member
|
@adinn your PR is in the merge queue. |
Member
|
Changes are on master. e17b00a |
Collaborator
Author
|
@olpaw Thanks for your help! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Fix for issue #2679