Shim Java 10 collections APIs #328
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
This commit adds Maven `<modules>` to the parent POM and two small
sub-modules: java8-shim and java10-shim.
Java8-shim defines an interface with methods like `.listCopyOf`
corresponding to Java 10's `java.util.List.copyOf`.
On Java 8-9, those APIs delegate to a homegrown equivalent.
On Java 10 and later, those APIs just call out to the standard
library functions.
I did the following experiment to see how well this JIT inlines.
The trace far below is derived by adding the main method below to
Java8Shim and running the command line second from bottom
```java
@OverRide public void main(String... argv) {
List<List<Integer>> ls = new ArrayList<>();
for (int i = 0; i < 10000000; ++i) {
ls.add(get().listOf(i, i + 1, i + 2));
}
}
```
Getting JIT diagnostics:
```sh
javac --release 8 -d out src/main/java/org/owasp/shim/Java8Shim.java \
src/main/java/org/owasp/shim/ForJava8.java
javac --release 10 -d out -cp out \
src/main/java/org/owasp/shim/ForJava9AndLater.java
java -cp out \
-XX:+UnlockDiagnosticVMOptions \
-XX:CompileCommand=print,org/owasp/shim/ForJava9AndLater.listOf \
org.owasp.shim.Java8Shim
```
<details><summary>Dump with -XX:CompileCommand=print</summary>
```
0x00000001144e9380: ; ImmutableOopMap {rbp=Oop [0]=Oop [8]=Oop }
;*anewarray {reexecute=0 rethrow=0 return_oop=1}
; - java.util.List::of@1 (line 847)
; - org.owasp.shim.ForJava9AndLater::listOf@3 (line 21)
0x00000001144e9380: fc83 9bff | 488b d8e9 | 27ff ffff
0x00000001144e938c: ; {metadata('java/util/ImmutableCollections$ListN')}
0x00000001144e938c: 48be 2807 | 1b44 0100 | 0000 488b
0x00000001144e9398: ; {runtime_call _new_instance_Java}
0x00000001144e9398: eb66 90e8
0x00000001144e939c: ; ImmutableOopMap {rbp=Oop [8]=Oop }
;*new {reexecute=0 rethrow=0 return_oop=1}
; - java.util.ImmutableCollections::listFromTrustedArray@115 (line 220)
; - java.util.List::of@16 (line 847)
; - org.owasp.shim.ForJava9AndLater::listOf@3 (line 21)
0x00000001144e939c: 60ad 9bff | ebac bd01 | 0000 004c | 8bc9 eb05 | bd02 0000 | 004c 890c | 24eb 0633 | ed4c 8914
0x00000001144e93bc: 24be 45ff
0x00000001144e93c0: ; {runtime_call UncommonTrapBlob}
0x00000001144e93c0: ffff 90e8
0x00000001144e93c4: ; ImmutableOopMap {[0]=Oop [8]=Oop }
;*ifnonnull {reexecute=1 rethrow=0 return_oop=0}
; - (reexecute) java.util.Objects::requireNonNull@1 (line 208)
; - java.util.ImmutableCollections::listFromTrustedArray@42 (line 213)
; - java.util.List::of@16 (line 847)
; - org.owasp.shim.ForJava9AndLater::listOf@3 (line 21)
0x00000001144e93c4: 3842 91ff | 488b f0eb | 0348 8bf0 | 4883 c430
0x00000001144e93d4: ; {runtime_call _rethrow_Java}
0x00000001144e93d4: 5de9 26b0
0x00000001144e93d8: ; {internal_word}
0x00000001144e93d8: 9bff 49ba | 6093 4e14 | 0100 0000 | 4d89 9760
0x00000001144e93e8: ; {runtime_call SafepointBlob}
0x00000001144e93e8: 0300 00e9 | 1053 91ff | f4f4 f4f4 | f4f4 f4f4 | f4f4 f4f4 | f4f4 f4f4
[Exception Handler]
0x00000001144e9400: ; {no_reloc}
0x00000001144e9400: e97b f59a | ffe8 0000 | 0000 4883
0x00000001144e940c: ; {runtime_call DeoptimizationBlob}
0x00000001144e940c: 2c24 05e9 | 8c45 91ff | f4f4 f4f4
[/MachCode]
```
iiuc, when there is one implementation of an interface loaded, the interface methods can devirtualize and the below shows that ForJava9AndLater::listOf with 3 arguments inlines to a null check and delegates the rest to `listFromTrustedArray`.
```
0x00000001144e93c4: ; ImmutableOopMap {[0]=Oop [8]=Oop }
;*ifnonnull {reexecute=1 rethrow=0 return_oop=0}
; - (reexecute) java.util.Objects::requireNonNull@1 (line 208)
; - java.util.ImmutableCollections::listFromTrustedArray@42 (line 213)
; - java.util.List::of@16 (line 847)
; - org.owasp.shim.ForJava9AndLater::listOf@3 (line 21)
```
Signed-off-by: Mike Samuel <mikesamuel@gmail.com>
Signed-off-by: Mike Samuel <mikesamuel@gmail.com>
|
Why is the code that requires Java 10 named |
|
As long as you generate bytecode for Java 10 ( ) one can never run this with Java 8, even if you add shims for the missing API. |
|
@kwin - I checked the files and they look like Java 8 bytecode to me According to https://docs.oracle.com/javase/specs/jvms/se21/html/jvms-4.html#jvms-4.1 , 52.0 is Java 8. |
|
Ok, I see now that the effective pom contains Line 198 in f729a08 source and target. That definitely deserves some cleanup.
|
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.
This commit adds Maven
<modules>to the parent POM and two small sub-modules: java8-shim and java10-shim.Java8-shim defines an interface with methods like
.listCopyOfcorresponding to Java 10'sjava.util.List.copyOf.On Java 8-9, those APIs delegate to a homegrown equivalent. On Java 10 and later, those APIs just call out to the standard library functions.
I did the following experiment to see how well this JIT inlines. The trace far below is derived by adding the main method below to Java8Shim and running the command line second from bottom
Getting JIT diagnostics:
javac --release 8 -d out src/main/java/org/owasp/shim/Java8Shim.java \ src/main/java/org/owasp/shim/ForJava8.java javac --release 10 -d out -cp out \ src/main/java/org/owasp/shim/ForJava9AndLater.java java -cp out \ -XX:+UnlockDiagnosticVMOptions \ -XX:CompileCommand=print,org/owasp/shim/ForJava9AndLater.listOf \ org.owasp.shim.Java8ShimDump with -XX:CompileCommand=print
iiuc, when there is one implementation of an interface loaded, the interface methods can devirtualize and the below shows that ForJava9AndLater::listOf with 3 arguments inlines to a null check and delegates the rest to
listFromTrustedArray.