Stop hardcoding -Xverify:none in SpawnAction

The motivation was to improve startup performance of host tools that we trust. The hard-coded flags for JavaBuilder and turbine were made obsolete by `java_toolchain.jvm_opts`, which allows them to be configured in the toolchain instead. The option has been deprecated in Java 13 and will be removed in a future release. Fixes #11381 PiperOrigin-RevId: 346160835
bazelbuild · Dec 7, 2020 · d91e5b4 · d91e5b4
1 parent 952c0d7
commit d91e5b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -1016,7 +1016,6 @@ private Builder setJavaExecutable(PathFragment javaExecutable, Artifact deployJa
       this.executableArgs =
           CustomCommandLine.builder()
               .addPath(javaExecutable)
-              .add("-Xverify:none")
               .addAll(ImmutableList.copyOf(jvmArgs))
               .addAll(ImmutableList.copyOf(launchArgs));
       toolsBuilder.add(deployJar);

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java
@@ -167,8 +167,7 @@ public void testBuilderWithJavaExecutable() throws Exception {
     collectingAnalysisEnvironment.registerAction(actions);
     SpawnAction action = (SpawnAction) actions[0];
     assertThat(action.getArguments())
-        .containsExactly(
-            "/bin/java", "-Xverify:none", "-jvmarg", "-cp", "pkg/exe.jar", "MyMainClass")
+        .containsExactly("/bin/java", "-jvmarg", "-cp", "pkg/exe.jar", "MyMainClass")
         .inOrder();
   }
 
@@ -194,8 +193,7 @@ public void testBuilderWithJavaExecutableAndParameterFile2() throws Exception {
 
     // The action reports all arguments, including those inside the param file
     assertThat(action.getArguments())
-        .containsExactly(
-            "/bin/java", "-Xverify:none", "-jvmarg", "-cp", "pkg/exe.jar", "MyMainClass", "-X")
+        .containsExactly("/bin/java", "-jvmarg", "-cp", "pkg/exe.jar", "MyMainClass", "-X")
         .inOrder();
 
     Spawn spawn =
@@ -206,7 +204,7 @@ public void testBuilderWithJavaExecutableAndParameterFile2() throws Exception {
     assertThat(spawn.getArguments())
         .containsExactly(
             "/bin/java",
-            "-Xverify:none",
+
             "-jvmarg",
             "-cp",
             "pkg/exe.jar",
@@ -242,7 +240,7 @@ public void testBuilderWithExtraExecutableArguments() throws Exception {
     assertThat(action.getArguments())
         .containsExactly(
             "/bin/java",
-            "-Xverify:none",
+
             "-jvmarg",
             "-cp",
             "pkg/exe.jar",