From aea3bd664137b1e04a2530cc47025f031c9b9974 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 26 Feb 2023 13:01:47 +0000
Subject: [PATCH] Re-enable DataflowConstProp for standard library builds

---
 build_system/build_sysroot.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build_system/build_sysroot.rs b/build_system/build_sysroot.rs
index 4fb77c35c70..76b602fe719 100644
--- a/build_system/build_sysroot.rs
+++ b/build_system/build_sysroot.rs
@@ -242,8 +242,7 @@ fn build_clif_sysroot_for_triple(
     rustflags
         .push_str(&format!(" --sysroot={}", RTSTARTUP_SYSROOT.to_path(dirs).to_str().unwrap()));
     if channel == "release" {
-        // FIXME re-enable DataflowConstProp once rust-lang/rust#108166 is fixed
-        rustflags.push_str(" -Zmir-opt-level=3 -Zmir-enable-passes=-DataflowConstProp");
+        rustflags.push_str(" -Zmir-opt-level=3");
     }
     compiler.rustflags += &rustflags;
     let mut build_cmd = STANDARD_LIBRARY.build(&compiler, dirs);