commit 872c11ae8d1fe9b74aaaf8874201ab7e0f2906df
author Benjamin Peterson <bp@benjamin.pe> Wed Jul 24 01:22:53 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jul 24 01:25:53 2019 -0700
tree c56665b40d8733d086617aa810960a2bc91b7544
parent 6dc66e1f763712419e2ff3b6306cc10839603714

Allow G1 in tools/jdk/BUILD.java_tools.

This is a followup to 01e6e05a35633df92cafc20b28eac15cd1aefa09. (I think BUILD.java_tools was introduced in between the creation of the PR for 01e6e05a35633df92cafc20b28eac15cd1aefa09 and its landing.)

Closes #8964.

PiperOrigin-RevId: 259695109

tools/jdk/BUILD.java_tools

diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools
index 711abf6..64bfc42 100644
--- a/tools/jdk/BUILD.java_tools
+++ b/tools/jdk/BUILD.java_tools
@@ -27,10 +27,6 @@
     javac = [":javac_jar"],
     javac_supports_workers = 1,
     jvm_opts = [
-        # In JDK9 we have seen a ~30% slow down in JavaBuilder performance when using
-        # G1 collector and having compact strings enabled.
-        "-XX:+UseParallelOldGC",
-        "-XX:-CompactStrings",
         # Allow JavaBuilder to access internal javac APIs.
         "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
         "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
@@ -88,10 +84,6 @@
     javac = [":javac_jar"],
     javac_supports_workers = 1,
     jvm_opts = [
-        # In JDK9 we have seen a ~30% slow down in JavaBuilder performance
-        # when using G1 collector and having compact strings enabled.
-        "-XX:+UseParallelOldGC",
-        "-XX:-CompactStrings",
         # Allow JavaBuilder to access internal javac APIs.
         "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
         "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
@@ -153,10 +145,6 @@
     javac = [":javac_jar"],
     javac_supports_workers = 1,
     jvm_opts = [
-        # In JDK9 we have seen a ~30% slow down in JavaBuilder performance when using
-        # G1 collector and having compact strings enabled.
-        "-XX:+UseParallelOldGC",
-        "-XX:-CompactStrings",
         # Allow JavaBuilder to access internal javac APIs.
         "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
         "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",