From aad707d39c496df1be1ceaaa2409538e90b70ffd Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Mon, 11 Sep 2023 12:28:28 +0000 Subject: [PATCH 1/3] Ignore ICE dumps --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 485968d9c56ff..332d898f1313a 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,8 @@ build/ /src/tools/x/target # Created by default with `src/ci/docker/run.sh` /obj/ +# Created on ICE during build +rustc-ice-*.txt ## Temporary files *~ From 9597d24f859421fce8067d6e1f18998156bb3da4 Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Mon, 11 Sep 2023 13:11:48 +0000 Subject: [PATCH 2/3] Fix rustfmt path in default vscode settings.json The r-a vscode extension has started `cd`-ing into the current crate's root directory, and then invoking rustfmt. But our rustfmt path is relative, and was then not available. --- src/etc/rust_analyzer_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/etc/rust_analyzer_settings.json b/src/etc/rust_analyzer_settings.json index 6e5e2c35005a6..39df45f8ba5a7 100644 --- a/src/etc/rust_analyzer_settings.json +++ b/src/etc/rust_analyzer_settings.json @@ -16,7 +16,7 @@ "compiler/rustc_codegen_gcc/Cargo.toml" ], "rust-analyzer.rustfmt.overrideCommand": [ - "./build/host/rustfmt/bin/rustfmt", + "${workspaceFolder}/build/host/rustfmt/bin/rustfmt", "--edition=2021" ], "rust-analyzer.procMacro.server": "./build/host/stage0/libexec/rust-analyzer-proc-macro-srv", From 07782ed36c38b5a8f66d8a757eaaafe0fcd7e08c Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Mon, 11 Sep 2023 17:37:40 +0000 Subject: [PATCH 3/3] Remove a now-unnecessary check for generators. There should be no cycles from the mir opt pipeline to generators, but not revealing and normalizing in generators may cause us to fix bugs with revealing and normalizing that will then still occur in async code. --- compiler/rustc_mir_transform/src/reveal_all.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/compiler/rustc_mir_transform/src/reveal_all.rs b/compiler/rustc_mir_transform/src/reveal_all.rs index 23442f8b97b7e..2ba1b4c94e896 100644 --- a/compiler/rustc_mir_transform/src/reveal_all.rs +++ b/compiler/rustc_mir_transform/src/reveal_all.rs @@ -13,11 +13,6 @@ impl<'tcx> MirPass<'tcx> for RevealAll { } fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) { - // Do not apply this transformation to generators. - if body.generator.is_some() { - return; - } - let param_env = tcx.param_env_reveal_all_normalized(body.source.def_id()); RevealAllVisitor { tcx, param_env }.visit_body_preserves_cfg(body); }