From 8ed6baa749dc88c8da0267839249945a28dc7338 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Fri, 17 Feb 2023 18:28:12 +0100 Subject: [PATCH] Rustup to rustc 1.69.0-nightly (2d14db321 2023-02-15) --- build_system/build_sysroot.rs | 3 ++- rust-toolchain | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build_system/build_sysroot.rs b/build_system/build_sysroot.rs index 6a4d6aaa3565e..62a025b4f8f75 100644 --- a/build_system/build_sysroot.rs +++ b/build_system/build_sysroot.rs @@ -240,7 +240,8 @@ fn build_clif_sysroot_for_triple( rustflags .push_str(&format!(" --sysroot={}", RTSTARTUP_SYSROOT.to_path(dirs).to_str().unwrap())); if channel == "release" { - rustflags.push_str(" -Zmir-opt-level=3"); + // FIXME re-enable DataflowConstProp once rust-lang/rust#108166 is fixed + rustflags.push_str(" -Zmir-opt-level=3 -Zmir-enable-passes=-DataflowConstProp"); } compiler.rustflags += &rustflags; let mut build_cmd = STANDARD_LIBRARY.build(&compiler, dirs); diff --git a/rust-toolchain b/rust-toolchain index eae1c2f9298a2..02cddbac1d948 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2023-02-15" +channel = "nightly-2023-02-16" components = ["rust-src", "rustc-dev", "llvm-tools-preview"]