diff options
| -rw-r--r-- | .mailmap | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/builder.rs | 8 | ||||
| -rw-r--r-- | src/bootstrap/src/core/builder/mod.rs | 6 | ||||
| -rw-r--r-- | triagebot.toml | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/.mailmap b/.mailmap index 7d3a250e06d..87f32d28f58 100644 --- a/.mailmap +++ b/.mailmap @@ -657,6 +657,8 @@ Vitali Haravy <HumaneProgrammer@gmail.com> Vitali Haravy <humaneprogrammer@gmail Vitaly Shukela <vi0oss@gmail.com> Waffle Lapkin <waffle.lapkin@gmail.com> Waffle Lapkin <waffle.lapkin@gmail.com> <waffle.lapkin@tasking.com> +Weihang Lo <me@weihanglo.tw> +Weihang Lo <me@weihanglo.tw> <weihanglo@users.noreply.github.com> Wesley Wiser <wwiser@gmail.com> <wesleywiser@microsoft.com> whitequark <whitequark@whitequark.org> William Ting <io@williamting.com> <william.h.ting@gmail.com> diff --git a/compiler/rustc_codegen_llvm/src/builder.rs b/compiler/rustc_codegen_llvm/src/builder.rs index ab0e43e60a4..5a34b52e6ef 100644 --- a/compiler/rustc_codegen_llvm/src/builder.rs +++ b/compiler/rustc_codegen_llvm/src/builder.rs @@ -610,14 +610,6 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> { } fn range_metadata(&mut self, load: &'ll Value, range: WrappingRange) { - if self.sess().target.arch == "amdgpu" { - // amdgpu/LLVM does something weird and thinks an i64 value is - // split into a v2i32, halving the bitwidth LLVM expects, - // tripping an assertion. So, for now, just disable this - // optimization. - return; - } - if self.cx.sess().opts.optimize == OptLevel::No { // Don't emit metadata we're not going to use return; diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs index c3a74683cd3..aaee1b08a40 100644 --- a/src/bootstrap/src/core/builder/mod.rs +++ b/src/bootstrap/src/core/builder/mod.rs @@ -825,8 +825,12 @@ impl<'a> Builder<'a> { match kind { Kind::Build => describe!( compile::Std, - compile::Rustc, + // FIXME(#135022): `compile::Assemble` **must** come before `compile::Rustc` after + // `PathSet` also permits prefix-matching, because `compile::Rustc` can consume the + // `"compiler"` path filter first, causing `compile::Assemble` to no longer run when + // the user writes `./x build compiler --stage 0`. compile::Assemble, + compile::Rustc, compile::CodegenBackend, compile::StartupObjects, tool::BuildManifest, diff --git a/triagebot.toml b/triagebot.toml index 5660eb999b7..436c88541a5 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -1208,7 +1208,7 @@ project-exploit-mitigations = [ "/src/doc/nomicon" = ["@ehuss"] "/src/doc/reference" = ["@ehuss"] "/src/doc/rust-by-example" = ["@ehuss"] -"/src/doc/rustc-dev-guide" = ["@kobzol"] +"/src/doc/rustc-dev-guide" = ["@kobzol", "@jieyouxu"] "/src/doc/rustdoc" = ["rustdoc"] "/src/doc/style-guide" = ["style-team"] "/src/etc" = ["@Mark-Simulacrum"] |