Skip to content

Commit 30fb587

Browse files
committed
Avoid using of "-opt:l:method" due never ending compilation errors on latest versions of JDK, see scala/bug#11671
1 parent 017d09f commit 30fb587

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
matrix:
2222
java:
2323
- graalvm@
24-
- zulu@1.8
24+
- zulu@
2525
2626
os:
2727
- ubuntu-latest

benchmark.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sbt -batch -java-home /usr/lib/jvm/graalvm-ee-java11 -Dmacro.settings=print-code
33
sbt -batch -java-home /usr/lib/jvm/graalvm-ee-java8 -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff graalvm-ee-java8.json .*' 2>&1 | tee graalvm-ee-java8.txt
44
sbt -batch -java-home /usr/lib/jvm/graalvm-ce-java11 -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff graalvm-ce-java11.json .*' 2>&1 | tee graalvm-ce-java11.txt
55
sbt -batch -java-home /usr/lib/jvm/graalvm-ce-java8 -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff graalvm-ce-java8.json .*' 2>&1 | tee graalvm-ce-java8.txt
6-
sbt -batch -java-home /usr/lib/jvm/corretto-11 -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -jvm /usr/lib/jvm/openjdk-15/bin/java -jvmArgsAppend "-XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler" -p size=128 -prof gc -rf json -rff openjdk-15-graal.json .*' 2>&1 | tee openjdk-15-graal.txt
7-
sbt -batch -java-home /usr/lib/jvm/corretto-11 -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -jvm /usr/lib/jvm/openjdk-15/bin/java -p size=128 -prof gc -rf json -rff openjdk-15.json .*' 2>&1 | tee openjdk-15.txt
6+
sbt -batch -java-home /usr/lib/jvm/openjdk-15 -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -jvmArgsAppend "-XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler" -p size=128 -prof gc -rf json -rff openjdk-15-graal.json .*' 2>&1 | tee openjdk-15-graal.txt
7+
sbt -batch -java-home /usr/lib/jvm/openjdk-15 -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff openjdk-15.json .*' 2>&1 | tee openjdk-15.txt
88
sbt -batch -java-home /usr/lib/jvm/corretto-11 -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff corretto-11.json .*' 2>&1 | tee corretto-11.txt
99
sbt -batch -java-home /usr/lib/jvm/corretto-8 -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff corretto-8.json .*' 2>&1 | tee corretto-8.txt

benchmark_osx.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sbt -batch -java-home /Library/Java/JavaVirtualMachines/graalvm-ee-java11/Conten
33
sbt -batch -java-home /Library/Java/JavaVirtualMachines/graalvm-ee-java8/Contents/Home -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff graalvm-ee-java8.json .*' 2>&1 | tee graalvm-ee-java8.txt
44
sbt -batch -java-home /Library/Java/JavaVirtualMachines/graalvm-ce-java11/Contents/Home -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff graalvm-ce-java11.json .*' 2>&1 | tee graalvm-ce-java11.txt
55
sbt -batch -java-home /Library/Java/JavaVirtualMachines/graalvm-ce-java8/Contents/Home -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff graalvm-ce-java8.json .*' 2>&1 | tee graalvm-ce-java8.txt
6-
sbt -batch -java-home /Library/Java/JavaVirtualMachines/corretto-11/Contents/Home -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -jvm /Library/Java/JavaVirtualMachines/openjdk-15/Contents/Home/bin/java -jvmArgsAppend "-XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler" -p size=128 -prof gc -rf json -rff openjdk-15-graal.json .*' 2>&1 | tee openjdk-15-graal.txt
7-
sbt -batch -java-home /Library/Java/JavaVirtualMachines/corretto-11/Contents/Home -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -jvm /Library/Java/JavaVirtualMachines/openjdk-15/Contents/Home/bin/java -p size=128 -prof gc -rf json -rff openjdk-15.json .*' 2>&1 | tee openjdk-15.txt
6+
sbt -batch -java-home /Library/Java/JavaVirtualMachines/openjdk-15/Contents/Home -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -jvmArgsAppend "-XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler" -p size=128 -prof gc -rf json -rff openjdk-15-graal.json .*' 2>&1 | tee openjdk-15-graal.txt
7+
sbt -batch -java-home /Library/Java/JavaVirtualMachines/openjdk-15/Contents/Home -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff openjdk-15.json .*' 2>&1 | tee openjdk-15.txt
88
sbt -batch -java-home /Library/Java/JavaVirtualMachines/corretto-11/Contents/Home -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff corretto-11.json .*' 2>&1 | tee corretto-11.txt
99
sbt -batch -java-home /Library/Java/JavaVirtualMachines/corretto-8/Contents/Home -Dmacro.settings=print-codecs clean 'jsoniter-scala-benchmark/jmh:run -p size=128 -prof gc -rf json -rff corretto-8.json .*' 2>&1 | tee corretto-8.txt

build.sbt

-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ lazy val commonSettings = Seq(
3434
"-Xlint",
3535
"-Xmacro-settings:" + sys.props.getOrElse("macro.settings", "none")
3636
) ++ (CrossVersion.partialVersion(scalaVersion.value) match {
37-
case Some((2, x)) if x >= 12 => Seq(
38-
"-opt:l:method"
39-
)
4037
case Some((2, x)) if x == 11 => Seq(
4138
"-Ybackend:GenBCode",
4239
"-Ydelambdafy:inline"

0 commit comments

Comments
 (0)