[7.1.0] Use execution info instead of hard-coded mnemonics for Java path mapping (#21461)
By removing Java rules from the hard-coded mnemonics allowlist for path
mapping, users can rely on `--modify_execution_info` to selectively
disable path mapping for them just like for Starlark actions.
This requires fixing two minor inconsistencies in how execution info is
populated for Java actions:
* In `JavaCompilationHelper`, `buildKeepingLast` is used instead of
`buildOrThrow` to prevent a crash when a target sets
`supports-path-mapping` via `tags`.
* In `JavaHeaderCompileAction`, `--experimental_inmemory_jdeps_files` no
longer causes all other execution info to be lost.
Fixes #21092
Closes #21093.
Commit
https://github.com/bazelbuild/bazel/commit/f8337c754c8c1b27b34b84cde2c608c802266e96
PiperOrigin-RevId: 609064092
Change-Id: I6803e34a6861f19d185542e707b00029ee018a0a
Co-authored-by: Fabian Meumertzheim <fabian@meumertzhe.im>
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/PathMappers.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/PathMappers.java
index f0d5288..9ccfd15 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/PathMappers.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/PathMappers.java
@@ -36,7 +36,8 @@
* PathMapper}).
*/
public final class PathMappers {
- // TODO: Replace with a command-line flag.
+ // TODO: Remove actions from this list by adding ExecutionRequirements.SUPPORTS_PATH_MAPPING to
+ // their execution info instead.
private static final ImmutableSet<String> SUPPORTED_MNEMONICS =
ImmutableSet.of(
"AndroidLint",
@@ -45,8 +46,6 @@
"DejetifySrcs",
"Desugar",
"DexBuilder",
- "Javac",
- "JavacTurbine",
"Jetify",
"JetifySrcs",
"LinkAndroidResources",
@@ -56,8 +55,6 @@
"StarlarkAARGenerator",
"StarlarkMergeCompiledAndroidResources",
"StarlarkRClassGenerator",
- "Turbine",
- "JavaResourceJar",
"Mock action");
/**
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
index 2ea7ca1..005d478 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
@@ -418,24 +418,26 @@
}
private ImmutableMap<String, String> getExecutionInfo() throws RuleErrorException {
- ImmutableMap.Builder<String, String> executionInfo = ImmutableMap.builder();
- ImmutableMap.Builder<String, String> workerInfo = ImmutableMap.builder();
+ ImmutableMap.Builder<String, String> modifiableExecutionInfo = ImmutableMap.builder();
+ modifiableExecutionInfo.put(ExecutionRequirements.SUPPORTS_PATH_MAPPING, "1");
if (javaToolchain.getJavacSupportsWorkers()) {
- workerInfo.put(ExecutionRequirements.SUPPORTS_WORKERS, "1");
+ modifiableExecutionInfo.put(ExecutionRequirements.SUPPORTS_WORKERS, "1");
}
if (javaToolchain.getJavacSupportsMultiplexWorkers()) {
- workerInfo.put(ExecutionRequirements.SUPPORTS_MULTIPLEX_WORKERS, "1");
+ modifiableExecutionInfo.put(ExecutionRequirements.SUPPORTS_MULTIPLEX_WORKERS, "1");
}
if (javaToolchain.getJavacSupportsWorkerCancellation()) {
- workerInfo.put(ExecutionRequirements.SUPPORTS_WORKER_CANCELLATION, "1");
+ modifiableExecutionInfo.put(ExecutionRequirements.SUPPORTS_WORKER_CANCELLATION, "1");
}
+ ImmutableMap.Builder<String, String> executionInfo = ImmutableMap.builder();
executionInfo.putAll(
getConfiguration()
- .modifiedExecutionInfo(workerInfo.buildOrThrow(), JavaCompileActionBuilder.MNEMONIC));
+ .modifiedExecutionInfo(
+ modifiableExecutionInfo.buildOrThrow(), JavaCompileActionBuilder.MNEMONIC));
executionInfo.putAll(
TargetUtils.getExecutionInfo(ruleContext.getRule(), ruleContext.isAllowTagsPropagation()));
- return executionInfo.buildOrThrow();
+ return executionInfo.buildKeepingLast();
}
/** Returns the bootclasspath explicit set in attributes if present, or else the default. */
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
index da08a18..0e6fc2a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -171,8 +171,6 @@
}
this.tools = tools;
this.compilationType = compilationType;
- // TODO(djasper): The only thing that is conveyed through the executionInfo is whether worker
- // mode is enabled or not. Investigate whether we can store just that.
this.executionInfo =
configuration.modifiedExecutionInfo(executionInfo, compilationType.mnemonic);
this.executableLine = executableLine;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
index be54d1d..6e11727 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
@@ -77,6 +77,8 @@
*/
public final class JavaHeaderCompileAction extends SpawnAction {
+ private static final String DIRECT_CLASSPATH_MNEMONIC = "Turbine";
+
private final boolean insertDependencies;
private final NestedSet<Artifact> additionalArtifactsForPathMapping;
@@ -466,14 +468,22 @@
}
}
- ImmutableMap<String, String> executionInfo =
- TargetUtils.getExecutionInfo(ruleContext.getRule(), ruleContext.isAllowTagsPropagation());
+ ImmutableMap.Builder<String, String> executionInfo = ImmutableMap.builder();
+ executionInfo.putAll(
+ ruleContext
+ .getConfiguration()
+ .modifiedExecutionInfo(
+ ImmutableMap.of(ExecutionRequirements.SUPPORTS_PATH_MAPPING, "1"),
+ JavaCompileActionBuilder.MNEMONIC));
+ executionInfo.putAll(
+ TargetUtils.getExecutionInfo(
+ ruleContext.getRule(), ruleContext.isAllowTagsPropagation()));
if (javaConfiguration.inmemoryJdepsFiles()) {
- executionInfo =
- ImmutableMap.of(
- ExecutionRequirements.REMOTE_EXECUTION_INLINE_OUTPUTS,
- outputDepsProto.getExecPathString());
+ executionInfo.put(
+ ExecutionRequirements.REMOTE_EXECUTION_INLINE_OUTPUTS,
+ outputDepsProto.getExecPathString());
}
+
if (useDirectClasspath) {
NestedSet<Artifact> classpath;
NestedSet<Artifact> additionalArtifactsForPathMapping;
@@ -513,10 +523,12 @@
/* env= */ actionEnvironment,
/* executionInfo= */ ruleContext
.getConfiguration()
- .modifiedExecutionInfo(executionInfo, "Turbine"),
+ .modifiedExecutionInfo(
+ executionInfo.buildKeepingLast(), DIRECT_CLASSPATH_MNEMONIC),
/* progressMessage= */ progressMessage,
/* runfilesSupplier= */ EmptyRunfilesSupplier.INSTANCE,
- /* mnemonic= */ "Turbine",
+
+ /* mnemonic= */ DIRECT_CLASSPATH_MNEMONIC,
/* outputPathsMode= */ PathMappers.getOutputPathsMode(
ruleContext.getConfiguration()),
// If classPathMode == BAZEL, also make sure to inject the dependencies to be
@@ -563,7 +575,7 @@
/* transitiveInputs= */ classpathEntries,
/* directJars= */ directJars,
/* outputs= */ outputs.build(),
- /* executionInfo= */ executionInfo,
+ /* executionInfo= */ executionInfo.buildKeepingLast(),
/* extraActionInfoSupplier= */ null,
/* executableLine= */ executableLine,
/* flagLine= */ commandLine.build(),
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java
index 4cf8599..4ee22dd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/ResourceJarActionBuilder.java
@@ -20,6 +20,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.ExecutionRequirements;
import com.google.devtools.build.lib.actions.ParamFileInfo;
import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -39,6 +40,8 @@
private static final ParamFileInfo PARAM_FILE_INFO =
ParamFileInfo.builder(ParameterFileType.SHELL_QUOTED).build();
+ private static final ImmutableMap<String, String> EXECUTION_INFO =
+ ImmutableMap.of(ExecutionRequirements.SUPPORTS_PATH_MAPPING, "1");
private Artifact outputJar;
private Map<PathFragment, Artifact> resources = ImmutableMap.of();
@@ -125,6 +128,7 @@
.addCommandLine(command.build(), PARAM_FILE_INFO)
.setProgressMessage("Building Java resource jar")
.setMnemonic(MNEMONIC)
+ .setExecutionInfo(EXECUTION_INFO)
.setExecGroup(execGroup)
.build(ruleContext));
}
