Skip to content

Surface observe_tool's per-argv result as a named per-tool observed identity; re-express toolchain_identity as the derived fold over those rows (unblocks hermetic-toolchain P2 reconcile) #7435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
briansrls merged 2 commits into from
Jul 29, 2026
Merged

Surface observe_tool's per-argv result as a named per-tool observed identity; re-express toolchain_identity as the derived fold over those rows (unblocks hermetic-toolchain P2 reconcile) #7435

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33ec440
WIP: Surface observe_tool's per-argv result as a named per-tool obser…
Jul 29, 2026
6269acb
WIP: Surface observe_tool's per-argv result as a named per-tool obser…
Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 35 additions & 12 deletions src/v1/stage0/src/v1_interpreter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8594,12 +8594,18 @@ fn emit_host_resolved_build_context_identity(
probe_workspace: &std::path::Path,
environment: &EmitHostBuildEnvironment,
) -> InterpResult<String> {
#[derive(Debug, Clone)]
struct ObservedToolIdentity {
tool_name: String,
observed_identity: String,
}

fn observe_tool(
requested: &str,
version_args: &[&str],
probe_workspace: &std::path::Path,
environment: &EmitHostBuildEnvironment,
) -> InterpResult<String> {
) -> InterpResult<ObservedToolIdentity> {
let resolved = resolve_host_tool_program(requested);
let canonical = std::fs::canonicalize(&resolved).map_err(|e| InterpError::TypeError {
msg: format!(
Expand Down Expand Up @@ -8645,13 +8651,25 @@ fn emit_host_resolved_build_context_identity(
] {
digest = v1_rt::hash_combine(digest, field);
}
Ok(digest)
Ok(ObservedToolIdentity {
tool_name: logical_name.to_string(),
observed_identity: digest,
})
}

fn fold_observed_toolchain_identity(rows: &[ObservedToolIdentity]) -> String {
debug_assert!(rows.iter().all(|row| !row.tool_name.is_empty()));
rows.iter().fold(
v1_rt::atom_identity_hash("emit-host-resolved-build-toolchain-v1".to_string()),
|acc, observed_tool_identity| {
v1_rt::hash_combine(acc, observed_tool_identity.observed_identity.clone())
},
)
}

let mut toolchain_identity =
v1_rt::atom_identity_hash("emit-host-resolved-build-toolchain-v1".to_string());
let cargo_configuration_identity =
emit_host_cargo_configuration_digest(environment, probe_workspace)?;
let mut observed_tool_identities = Vec::new();
for argv in build_argvs {
let requested = argv.first().ok_or_else(|| InterpError::TypeError {
msg: "emit_host_run_transport_cached: empty build argv".to_string(),
Expand All @@ -8665,19 +8683,24 @@ fn emit_host_resolved_build_context_identity(
} else {
&["--version"]
};
toolchain_identity = v1_rt::hash_combine(
toolchain_identity,
observe_tool(requested, version_args, probe_workspace, environment)?,
);
observed_tool_identities.push(observe_tool(
requested,
version_args,
probe_workspace,
environment,
)?);

if requested_name == "cargo" {
let rustc = std::env::var("RUSTC").unwrap_or_else(|_| "rustc".to_string());
toolchain_identity = v1_rt::hash_combine(
toolchain_identity,
observe_tool(&rustc, &["-vV"], probe_workspace, environment)?,
);
observed_tool_identities.push(observe_tool(
&rustc,
&["-vV"],
probe_workspace,
environment,
)?);
}
}
let toolchain_identity = fold_observed_toolchain_identity(&observed_tool_identities);
Ok(emit_host_artifact_realization_digest(&[
("resolved-build-toolchain", toolchain_identity),
("constructed-build-environment", environment.digest.clone()),
Expand Down
Loading