Don't use UseJVMCICompiler java option

luben · Oct 20, 2023 · 5a10c1e · 5a10c1e
1 parent 927768b
commit 5a10c1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 30 deletions.
diff --git a/sbt b/sbt
@@ -252,21 +252,7 @@ is_apple_silicon() { [[ "$(uname -s)" == "Darwin" && "$(uname -m)" == "arm64" ]]
 
 # MaxPermSize critical on pre-8 JVMs but incurs noisy warning on 8+
 default_jvm_opts() {
-  local -r v="$(java_version)"
-  if [[ $v -ge 17 ]]; then
-    echo "$default_jvm_opts_common"
-  elif [[ $v -ge 10 ]]; then
-    if is_apple_silicon; then
-      # As of Dec 2020, JVM for Apple Silicon (M1) doesn't support JVMCI
-      echo "$default_jvm_opts_common"
-    else
-      echo "$default_jvm_opts_common -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
-    fi
-  elif [[ $v -ge 8 ]]; then
-    echo "$default_jvm_opts_common"
-  else
-    echo "-XX:MaxPermSize=384m $default_jvm_opts_common"
-  fi
+  echo "$default_jvm_opts_common"
 }
 
 execRunner() {

diff --git a/sbt-java-module-info/sbt b/sbt-java-module-info/sbt
@@ -252,21 +252,7 @@ is_apple_silicon() { [[ "$(uname -s)" == "Darwin" && "$(uname -m)" == "arm64" ]]
 
 # MaxPermSize critical on pre-8 JVMs but incurs noisy warning on 8+
 default_jvm_opts() {
-  local -r v="$(java_version)"
-  if [[ $v -ge 17 ]]; then
-    echo "$default_jvm_opts_common"
-  elif [[ $v -ge 10 ]]; then
-    if is_apple_silicon; then
-      # As of Dec 2020, JVM for Apple Silicon (M1) doesn't support JVMCI
-      echo "$default_jvm_opts_common"
-    else
-      echo "$default_jvm_opts_common -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
-    fi
-  elif [[ $v -ge 8 ]]; then
-    echo "$default_jvm_opts_common"
-  else
-    echo "-XX:MaxPermSize=384m $default_jvm_opts_common"
-  fi
+  echo "$default_jvm_opts_common"
 }
 
 execRunner() {