bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

add new field forced_compiler to Compiler

Browse source 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
onur-ozkan 2025-03-05 09:26:04 +03:00
parent fd17deacce
commit b885407c0c
4 changed files with 97 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/bootstrap/src/core/build_steps/dist.rs
View file

@ -2112,8 +2112,7 @@ pub fn maybe_install_llvm_target(builder: &Builder<'_>, target: TargetSelection,
),
)]
pub fn maybe_install_llvm_runtime(builder: &Builder<'_>, target: TargetSelection, sysroot: &Path) {
let dst_libdir =
sysroot.join(builder.sysroot_libdir_relative(Compiler { stage: 1, host: target }));
let dst_libdir = sysroot.join(builder.sysroot_libdir_relative(Compiler::new(1, target)));
// We do not need to copy LLVM files into the sysroot if it is not
// dynamically linked; it is already included into librustc_llvm
// statically.

9
src/bootstrap/src/core/builder/mod.rs
View file

@ -1234,7 +1234,7 @@ impl<'a> Builder<'a> {
),
)]
pub fn compiler(&self, stage: u32, host: TargetSelection) -> Compiler {
self.ensure(compile::Assemble { target_compiler: Compiler { stage, host } })
self.ensure(compile::Assemble { target_compiler: Compiler::new(stage, host) })
}
/// Similar to `compiler`, except handles the full-bootstrap option to
@ -1272,7 +1272,7 @@ impl<'a> Builder<'a> {
target: TargetSelection,
) -> Compiler {
#![allow(clippy::let_and_return)]
let resolved_compiler = if self.build.force_use_stage2(stage) {
let mut resolved_compiler = if self.build.force_use_stage2(stage) {
trace!(target: "COMPILER_FOR", ?stage, "force_use_stage2");
self.compiler(2, self.config.build)
} else if self.build.force_use_stage1(stage, target) {
@ -1282,6 +1282,11 @@ impl<'a> Builder<'a> {
trace!(target: "COMPILER_FOR", ?stage, ?host, "no force, fallback to `compiler()`");
self.compiler(stage, host)
};
if stage != resolved_compiler.stage {
resolved_compiler.forced_compiler(true);
}
trace!(target: "COMPILER_FOR", ?resolved_compiler);
resolved_compiler
}

128
src/bootstrap/src/core/builder/tests.rs
View file

@ -71,7 +71,7 @@ fn check_cli<const N: usize>(paths: [&str; N]) {
macro_rules! std {
($host:ident => $target:ident, stage = $stage:literal) => {
compile::Std::new(
Compiler { host: TargetSelection::from_user($host), stage: $stage },
Compiler::new($stage, TargetSelection::from_user($host)),
TargetSelection::from_user($target),
)
};
@ -84,7 +84,7 @@ macro_rules! doc_std {
macro_rules! rustc {
($host:ident => $target:ident, stage = $stage:literal) => {
compile::Rustc::new(
Compiler { host: TargetSelection::from_user($host), stage: $stage },
Compiler::new($stage, TargetSelection::from_user($host)),
TargetSelection::from_user($target),
)
};
@ -296,7 +296,7 @@ mod defaults {
first(cache.all::<tool::Rustdoc>()),
// Recall that rustdoc stages are off-by-one
// - this is the compiler it's _linked_ to, not built with.
&[tool::Rustdoc { compiler: Compiler { host: a, stage: 1 } }],
&[tool::Rustdoc { compiler: Compiler::new(1, a) }],
);
assert_eq!(
first(cache.all::<compile::Rustc>()),
@ -319,7 +319,7 @@ mod defaults {
first(cache.all::<tool::Rustdoc>()),
// This is the beta rustdoc.
// Add an assert here to make sure this is the only rustdoc built.
&[tool::Rustdoc { compiler: Compiler { host: a, stage: 0 } }],
&[tool::Rustdoc { compiler: Compiler::new(0, a) }],
);
assert!(cache.all::<compile::Rustc>().is_empty());
}
@ -352,16 +352,16 @@ mod defaults {
assert_eq!(
first(cache.all::<compile::Assemble>()),
&[
compile::Assemble { target_compiler: Compiler { host: a, stage: 0 } },
compile::Assemble { target_compiler: Compiler { host: a, stage: 1 } },
compile::Assemble { target_compiler: Compiler { host: b, stage: 1 } },
compile::Assemble { target_compiler: Compiler::new(0, a) },
compile::Assemble { target_compiler: Compiler::new(1, a) },
compile::Assemble { target_compiler: Compiler::new(1, b) },
]
);
assert_eq!(
first(cache.all::<tool::Rustdoc>()),
&[
tool::Rustdoc { compiler: Compiler { host: a, stage: 1 } },
tool::Rustdoc { compiler: Compiler { host: b, stage: 1 } },
tool::Rustdoc { compiler: Compiler::new(1, a) },
tool::Rustdoc { compiler: Compiler::new(1, b) },
],
);
assert_eq!(
@ -386,14 +386,14 @@ mod defaults {
assert_eq!(first(cache.all::<doc::ErrorIndex>()), &[doc::ErrorIndex { target: a },]);
assert_eq!(
first(cache.all::<tool::ErrorIndex>()),
&[tool::ErrorIndex { compiler: Compiler { host: a, stage: 0 } }]
&[tool::ErrorIndex { compiler: Compiler::new(0, a) }]
);
// docs should be built with the beta compiler, not with the stage0 artifacts.
// recall that rustdoc is off-by-one: `stage` is the compiler rustdoc is _linked_ to,
// not the one it was built by.
assert_eq!(
first(cache.all::<tool::Rustdoc>()),
&[tool::Rustdoc { compiler: Compiler { host: a, stage: 0 } },]
&[tool::Rustdoc { compiler: Compiler::new(0, a) },]
);
}
}
@ -418,17 +418,17 @@ mod dist {
assert_eq!(first(cache.all::<dist::Mingw>()), &[dist::Mingw { host: a },]);
assert_eq!(
first(cache.all::<dist::Rustc>()),
&[dist::Rustc { compiler: Compiler { host: a, stage: 2 } },]
&[dist::Rustc { compiler: Compiler::new(2, a) },]
);
assert_eq!(
first(cache.all::<dist::Std>()),
&[dist::Std { compiler: Compiler { host: a, stage: 1 }, target: a },]
&[dist::Std { compiler: Compiler::new(1, a), target: a },]
);
assert_eq!(first(cache.all::<dist::Src>()), &[dist::Src]);
// Make sure rustdoc is only built once.
assert_eq!(
first(cache.all::<tool::Rustdoc>()),
&[tool::Rustdoc { compiler: Compiler { host: a, stage: 2 } },]
&[tool::Rustdoc { compiler: Compiler::new(2, a) },]
);
}
@ -450,13 +450,13 @@ mod dist {
);
assert_eq!(
first(cache.all::<dist::Rustc>()),
&[dist::Rustc { compiler: Compiler { host: a, stage: 2 } },]
&[dist::Rustc { compiler: Compiler::new(2, a) },]
);
assert_eq!(
first(cache.all::<dist::Std>()),
&[
dist::Std { compiler: Compiler { host: a, stage: 1 }, target: a },
dist::Std { compiler: Compiler { host: a, stage: 2 }, target: b },
dist::Std { compiler: Compiler::new(1, a), target: a },
dist::Std { compiler: Compiler::new(2, a), target: b },
]
);
assert_eq!(first(cache.all::<dist::Src>()), &[dist::Src]);
@ -483,15 +483,15 @@ mod dist {
assert_eq!(
first(cache.all::<dist::Rustc>()),
&[
dist::Rustc { compiler: Compiler { host: a, stage: 2 } },
dist::Rustc { compiler: Compiler { host: b, stage: 2 } },
dist::Rustc { compiler: Compiler::new(2, a) },
dist::Rustc { compiler: Compiler::new(2, b) },
]
);
assert_eq!(
first(cache.all::<dist::Std>()),
&[
dist::Std { compiler: Compiler { host: a, stage: 1 }, target: a },
dist::Std { compiler: Compiler { host: a, stage: 1 }, target: b },
dist::Std { compiler: Compiler::new(1, a), target: a },
dist::Std { compiler: Compiler::new(1, a), target: b },
]
);
assert_eq!(
@ -519,7 +519,7 @@ mod dist {
assert_eq!(
first(cache.all::<dist::Rustc>()),
&[dist::Rustc { compiler: Compiler { host: b, stage: 2 } },]
&[dist::Rustc { compiler: Compiler::new(2, b) },]
);
assert_eq!(
first(cache.all::<compile::Rustc>()),
@ -556,16 +556,16 @@ mod dist {
assert_eq!(
first(cache.all::<dist::Rustc>()),
&[
dist::Rustc { compiler: Compiler { host: a, stage: 2 } },
dist::Rustc { compiler: Compiler { host: b, stage: 2 } },
dist::Rustc { compiler: Compiler::new(2, a) },
dist::Rustc { compiler: Compiler::new(2, b) },
]
);
assert_eq!(
first(cache.all::<dist::Std>()),
&[
dist::Std { compiler: Compiler { host: a, stage: 1 }, target: a },
dist::Std { compiler: Compiler { host: a, stage: 1 }, target: b },
dist::Std { compiler: Compiler { host: a, stage: 2 }, target: c },
dist::Std { compiler: Compiler::new(1, a), target: a },
dist::Std { compiler: Compiler::new(1, a), target: b },
dist::Std { compiler: Compiler::new(2, a), target: c },
]
);
assert_eq!(first(cache.all::<dist::Src>()), &[dist::Src]);
@ -583,7 +583,7 @@ mod dist {
assert_eq!(first(cache.all::<dist::Mingw>()), &[dist::Mingw { host: c },]);
assert_eq!(
first(cache.all::<dist::Std>()),
&[dist::Std { compiler: Compiler { host: a, stage: 2 }, target: c },]
&[dist::Std { compiler: Compiler::new(2, a), target: c },]
);
}
@ -608,15 +608,15 @@ mod dist {
assert_eq!(
first(cache.all::<dist::Rustc>()),
&[
dist::Rustc { compiler: Compiler { host: a, stage: 2 } },
dist::Rustc { compiler: Compiler { host: b, stage: 2 } },
dist::Rustc { compiler: Compiler::new(2, a) },
dist::Rustc { compiler: Compiler::new(2, b) },
]
);
assert_eq!(
first(cache.all::<dist::Std>()),
&[
dist::Std { compiler: Compiler { host: a, stage: 1 }, target: a },
dist::Std { compiler: Compiler { host: a, stage: 1 }, target: b },
dist::Std { compiler: Compiler::new(1, a), target: a },
dist::Std { compiler: Compiler::new(1, a), target: b },
]
);
assert_eq!(first(cache.all::<dist::Src>()), &[dist::Src]);
@ -633,10 +633,10 @@ mod dist {
assert_eq!(
first(cache.all::<compile::Assemble>()),
&[
compile::Assemble { target_compiler: Compiler { host: a, stage: 0 } },
compile::Assemble { target_compiler: Compiler { host: a, stage: 1 } },
compile::Assemble { target_compiler: Compiler { host: a, stage: 2 } },
compile::Assemble { target_compiler: Compiler { host: b, stage: 2 } },
compile::Assemble { target_compiler: Compiler::new(0, a) },
compile::Assemble { target_compiler: Compiler::new(1, a) },
compile::Assemble { target_compiler: Compiler::new(2, a) },
compile::Assemble { target_compiler: Compiler::new(2, b) },
]
);
}
@ -683,28 +683,16 @@ mod dist {
first(builder.cache.all::<compile::Assemble>()),
&[
compile::Assemble {
target_compiler: Compiler {
host: TargetSelection::from_user(TEST_TRIPLE_1),
stage: 0
}
target_compiler: Compiler::new(0, TargetSelection::from_user(TEST_TRIPLE_1),)
},
compile::Assemble {
target_compiler: Compiler {
host: TargetSelection::from_user(TEST_TRIPLE_1),
stage: 1
}
target_compiler: Compiler::new(1, TargetSelection::from_user(TEST_TRIPLE_1),)
},
compile::Assemble {
target_compiler: Compiler {
host: TargetSelection::from_user(TEST_TRIPLE_1),
stage: 2
}
target_compiler: Compiler::new(2, TargetSelection::from_user(TEST_TRIPLE_1),)
},
compile::Assemble {
target_compiler: Compiler {
host: TargetSelection::from_user(TEST_TRIPLE_2),
stage: 2
}
target_compiler: Compiler::new(2, TargetSelection::from_user(TEST_TRIPLE_2),)
},
]
);
@ -747,9 +735,9 @@ mod dist {
assert_eq!(
first(builder.cache.all::<compile::Assemble>()),
&[
compile::Assemble { target_compiler: Compiler { host: a, stage: 0 } },
compile::Assemble { target_compiler: Compiler { host: a, stage: 1 } },
compile::Assemble { target_compiler: Compiler { host: a, stage: 2 } },
compile::Assemble { target_compiler: Compiler::new(0, a) },
compile::Assemble { target_compiler: Compiler::new(1, a) },
compile::Assemble { target_compiler: Compiler::new(2, a) },
]
);
assert_eq!(
@ -798,7 +786,7 @@ mod dist {
assert_eq!(
first(builder.cache.all::<test::Crate>()),
&[test::Crate {
compiler: Compiler { host, stage: 0 },
compiler: Compiler::new(0, host),
target: host,
mode: crate::Mode::Std,
crates: vec!["std".to_owned()],
@ -824,13 +812,13 @@ mod dist {
);
assert_eq!(
first(builder.cache.all::<tool::ErrorIndex>()),
&[tool::ErrorIndex { compiler: Compiler { host: a, stage: 1 } }]
&[tool::ErrorIndex { compiler: Compiler::new(1, a) }]
);
// This is actually stage 1, but Rustdoc::run swaps out the compiler with
// stage minus 1 if --stage is not 0. Very confusing!
assert_eq!(
first(builder.cache.all::<tool::Rustdoc>()),
&[tool::Rustdoc { compiler: Compiler { host: a, stage: 2 } },]
&[tool::Rustdoc { compiler: Compiler::new(2, a) },]
);
}
@ -870,7 +858,7 @@ mod dist {
);
assert_eq!(
first(builder.cache.all::<tool::ErrorIndex>()),
&[tool::ErrorIndex { compiler: Compiler { host: a, stage: 1 } }]
&[tool::ErrorIndex { compiler: Compiler::new(1, a) }]
);
// Unfortunately rustdoc is built twice. Once from stage1 for compiletest
// (and other things), and once from stage0 for std crates. Ideally it
@ -886,9 +874,9 @@ mod dist {
assert_eq!(
first(builder.cache.all::<tool::Rustdoc>()),
&[
tool::Rustdoc { compiler: Compiler { host: a, stage: 0 } },
tool::Rustdoc { compiler: Compiler { host: a, stage: 1 } },
tool::Rustdoc { compiler: Compiler { host: a, stage: 2 } },
tool::Rustdoc { compiler: Compiler::new(0, a) },
tool::Rustdoc { compiler: Compiler::new(1, a) },
tool::Rustdoc { compiler: Compiler::new(2, a) },
]
);
}
@ -904,7 +892,7 @@ mod sysroot_target_dirs {
let build = Build::new(configure("build", &[TEST_TRIPLE_1], &[TEST_TRIPLE_1]));
let builder = Builder::new(&build);
let target_triple_1 = TargetSelection::from_user(TEST_TRIPLE_1);
let compiler = Compiler { stage: 1, host: target_triple_1 };
let compiler = Compiler::new(1, target_triple_1);
let target_triple_2 = TargetSelection::from_user(TEST_TRIPLE_2);
let actual = builder.sysroot_target_libdir(compiler, target_triple_2);
@ -924,7 +912,7 @@ mod sysroot_target_dirs {
let build = Build::new(configure("build", &[TEST_TRIPLE_1], &[TEST_TRIPLE_1]));
let builder = Builder::new(&build);
let target_triple_1 = TargetSelection::from_user(TEST_TRIPLE_1);
let compiler = Compiler { stage: 1, host: target_triple_1 };
let compiler = Compiler::new(1, target_triple_1);
let target_triple_2 = TargetSelection::from_user(TEST_TRIPLE_2);
let actual = builder.sysroot_target_bindir(compiler, target_triple_2);
@ -1128,13 +1116,13 @@ fn test_get_tool_rustc_compiler() {
let target_triple_1 = TargetSelection::from_user(TEST_TRIPLE_1);
let compiler = Compiler { stage: 2, host: target_triple_1 };
let expected = Compiler { stage: 1, host: target_triple_1 };
let compiler = Compiler::new(2, target_triple_1);
let expected = Compiler::new(1, target_triple_1);
let actual = tool::get_tool_rustc_compiler(&builder, compiler);
assert_eq!(expected, actual);
let compiler = Compiler { stage: 1, host: target_triple_1 };
let expected = Compiler { stage: 0, host: target_triple_1 };
let compiler = Compiler::new(1, target_triple_1);
let expected = Compiler::new(0, target_triple_1);
let actual = tool::get_tool_rustc_compiler(&builder, compiler);
assert_eq!(expected, actual);
@ -1143,8 +1131,8 @@ fn test_get_tool_rustc_compiler() {
let build = Build::new(config);
let builder = Builder::new(&build);
let compiler = Compiler { stage: 1, host: target_triple_1 };
let expected = Compiler { stage: 1, host: target_triple_1 };
let compiler = Compiler::new(1, target_triple_1);
let expected = Compiler::new(1, target_triple_1);
let actual = tool::get_tool_rustc_compiler(&builder, compiler);
assert_eq!(expected, actual);
}

32
src/bootstrap/src/lib.rs
View file

@ -92,10 +92,27 @@ const EXTRA_CHECK_CFGS: &[(Option<Mode>, &str, Option<&[&'static str]>)] = &[
/// Each compiler has a `stage` that it is associated with and a `host` that
/// corresponds to the platform the compiler runs on. This structure is used as
/// a parameter to many methods below.
#[derive(Eq, PartialOrd, Ord, PartialEq, Clone, Copy, Hash, Debug)]
#[derive(Eq, PartialOrd, Ord, Clone, Copy, Debug)]
pub struct Compiler {
stage: u32,
host: TargetSelection,
/// Indicates whether `compiler_for` was used to force a specific compiler stage.
/// This field is ignored in `Hash` and `PartialEq` implementations as only the `stage`
/// and `host` fields are relevant for those.
forced_compiler: bool,
}
impl std::hash::Hash for Compiler {
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
self.stage.hash(state);
self.host.hash(state);
}
}
impl PartialEq for Compiler {
fn eq(&self, other: &Self) -> bool {
self.stage == other.stage && self.host == other.host
}
}
#[derive(PartialEq, Eq, Copy, Clone, Debug)]
@ -1964,6 +1981,14 @@ fn chmod(path: &Path, perms: u32) {
fn chmod(_path: &Path, _perms: u32) {}
impl Compiler {
pub fn new(stage: u32, host: TargetSelection) -> Self {
Self { stage, host, forced_compiler: false }
}
pub fn forced_compiler(&mut self, forced_compiler: bool) {
self.forced_compiler = forced_compiler;
}
pub fn with_stage(mut self, stage: u32) -> Compiler {
self.stage = stage;
self
@ -1973,6 +1998,11 @@ impl Compiler {
pub fn is_snapshot(&self, build: &Build) -> bool {
self.stage == 0 && self.host == build.build
}
/// Indicates whether `compiler_for` was used to force a specific compiler stage.
pub fn is_forced_compiler(&self) -> bool {
self.forced_compiler
}
}
fn envify(s: &str) -> String {