[SOL] Advance llvm commit (#92)

* Advance llvm commit

Author: LucasSte

library/std/Cargo.toml

@@ -18,7 +18,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
 panic_abort = { path = "../panic_abort" }
 core = { path = "../core", public = true }
 libc = { version = "0.2.150", default-features = false, features = ['rustc-dep-of-std'], public = true }
-compiler_builtins = { version = "0.1.103" }
+compiler_builtins = { version = "=0.1.103" }
 profiler_builtins = { path = "../profiler_builtins", optional = true }
 unwind = { path = "../unwind" }
 hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std'] }

src/bootstrap/src/core/config/config.rs

@@ -19,7 +19,6 @@ use std::process::Command;
 use std::str::FromStr;
 
 use crate::core::build_steps::compile::CODEGEN_BACKEND_PREFIX;
-use crate::core::build_steps::llvm;
 use crate::core::config::flags::{Color, Flags, Warnings};
 use crate::utils::cache::{Interned, INTERNER};
 use crate::utils::channel::{self, GitInfo};
@@ -2110,34 +2109,35 @@ impl Config {
 
     fn parse_download_ci_llvm(
         &self,
-        download_ci_llvm: Option<StringOrBool>,
-        asserts: bool,
+        _download_ci_llvm: Option<StringOrBool>,
+        _asserts: bool,
     ) -> bool {
-        match download_ci_llvm {
-            None => self.channel == "dev" && llvm::is_ci_llvm_available(&self, asserts),
-            Some(StringOrBool::Bool(b)) => b,
-            Some(StringOrBool::String(s)) if s == "if-available" => {
-                llvm::is_ci_llvm_available(&self, asserts)
-            }
-            Some(StringOrBool::String(s)) if s == "if-unchanged" => {
-                // Git is needed to track modifications here, but tarball source is not available.
-                // If not modified here or built through tarball source, we maintain consistency
-                // with '"if available"'.
-                if !self.rust_info.is_from_tarball()
-                    && self
-                        .last_modified_commit(&["src/llvm-project"], "download-ci-llvm", true)
-                        .is_none()
-                {
-                    // there are some untracked changes in the the given paths.
-                    false
-                } else {
-                    llvm::is_ci_llvm_available(&self, asserts)
-                }
-            }
-            Some(StringOrBool::String(other)) => {
-                panic!("unrecognized option for download-ci-llvm: {:?}", other)
-            }
-        }
+        // match download_ci_llvm {
+        //     None => self.channel == "dev" && llvm::is_ci_llvm_available(&self, asserts),
+        //     Some(StringOrBool::Bool(b)) => b,
+        //     Some(StringOrBool::String(s)) if s == "if-available" => {
+        //         llvm::is_ci_llvm_available(&self, asserts)
+        //     }
+        //     Some(StringOrBool::String(s)) if s == "if-unchanged" => {
+        //         // Git is needed to track modifications here, but tarball source is not available.
+        //         // If not modified here or built through tarball source, we maintain consistency
+        //         // with '"if available"'.
+        //         if !self.rust_info.is_from_tarball()
+        //             && self
+        //                 .last_modified_commit(&["src/llvm-project"], "download-ci-llvm", true)
+        //                 .is_none()
+        //         {
+        //             // there are some untracked changes in the the given paths.
+        //             false
+        //         } else {
+        //             llvm::is_ci_llvm_available(&self, asserts)
+        //         }
+        //     }
+        //     Some(StringOrBool::String(other)) => {
+        //         panic!("unrecognized option for download-ci-llvm: {:?}", other)
+        //     }
+        // }
+        false
     }
 
     /// Returns the last commit in which any of `modified_paths` were changed,

src/bootstrap/src/tests/config.rs

@@ -16,29 +16,29 @@ fn parse(config: &str) -> Config {
     })
 }
 
-#[test]
-fn download_ci_llvm() {
-    if crate::core::build_steps::llvm::is_ci_llvm_modified(&parse("")) {
-        eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change");
-        return;
-    }
-
-    let parse_llvm = |s| parse(s).llvm_from_ci;
-    let if_available = parse_llvm("llvm.download-ci-llvm = \"if-available\"");
-
-    assert!(parse_llvm("llvm.download-ci-llvm = true"));
-    assert!(!parse_llvm("llvm.download-ci-llvm = false"));
-    assert_eq!(parse_llvm(""), if_available);
-    assert_eq!(parse_llvm("rust.channel = \"dev\""), if_available);
-    assert!(!parse_llvm("rust.channel = \"stable\""));
-    assert!(parse_llvm("build.build = \"x86_64-unknown-linux-gnu\""));
-    assert!(parse_llvm(
-        "llvm.assertions = true \r\n build.build = \"x86_64-unknown-linux-gnu\" \r\n llvm.download-ci-llvm = \"if-available\""
-    ));
-    assert!(!parse_llvm(
-        "llvm.assertions = true \r\n build.build = \"aarch64-apple-darwin\" \r\n llvm.download-ci-llvm = \"if-available\""
-    ));
-}
+// #[test]
+// fn download_ci_llvm() {
+//     if crate::core::build_steps::llvm::is_ci_llvm_modified(&parse("")) {
+//         eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change");
+//         return;
+//     }
+
+//     let parse_llvm = |s| parse(s).llvm_from_ci;
+//     let if_available = parse_llvm("llvm.download-ci-llvm = \"if-available\"");
+
+//     assert!(parse_llvm("llvm.download-ci-llvm = true"));
+//     assert!(!parse_llvm("llvm.download-ci-llvm = false"));
+//     assert_eq!(parse_llvm(""), if_available);
+//     assert_eq!(parse_llvm("rust.channel = \"dev\""), if_available);
+//     assert!(!parse_llvm("rust.channel = \"stable\""));
+//     assert!(parse_llvm("build.build = \"x86_64-unknown-linux-gnu\""));
+//     assert!(parse_llvm(
+//         "llvm.assertions = true \r\n build.build = \"x86_64-unknown-linux-gnu\" \r\n llvm.download-ci-llvm = \"if-available\""
+//     ));
+//     assert!(!parse_llvm(
+//         "llvm.assertions = true \r\n build.build = \"aarch64-apple-darwin\" \r\n llvm.download-ci-llvm = \"if-available\""
+//     ));
+// }
 
 // FIXME(onur-ozkan): extend scope of the test
 // refs:

src/ci/scripts/run-build-from-ci.sh

@@ -7,7 +7,7 @@ IFS=$'\n\t'
 
 source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 
-export CI="true"
+#export CI="true"
 export SRC=.
 
 echo "::add-matcher::src/ci/github-actions/problem_matchers.json"