update

Author: tgross35

ci/run.sh

@@ -63,8 +63,7 @@ symcheck+=(-- build-and-check)
 "${symcheck[@]}" -p compiler_builtins --target "$target" --features no-f16-f128 --release
 
 build_intrinsics_test() {
-    # Mostly we want to check that `cargo build` works, but we also go via
-    # symcheck here to see if any duplicates sneak in somehow.
+    # symcheck also checks the results of builtins-test-intrinsics
     "${symcheck[@]}" \
         --target "$target" --verbose \
         --manifest-path builtins-test-intrinsics/Cargo.toml "$@"

crates/symbol-check/src/main.rs

@@ -12,6 +12,7 @@ use object::{Object, ObjectSymbol, Symbol, SymbolKind, SymbolScope, SymbolSectio
 use serde_json::Value;
 
 const CHECK_LIBRARIES: &[&str] = &["compiler_builtins", "builtins_test_intrinsics"];
+const CHECK_EXTENSIONS: &[Option<&str>] = &[Some("rlib"), Some("a"), Some("exe"), None];
 
 const USAGE: &str = "Usage:
 
@@ -55,7 +56,7 @@ fn exec_cargo_with_args(args: &[&str]) -> Vec<PathBuf> {
 
     let stdout = cmd.stdout.take().unwrap();
     let reader = BufReader::new(stdout);
-    let mut rlibs = Vec::new();
+    let mut check_files = Vec::new();
 
     for line in reader.lines() {
         let line = line.expect("failed to read line");
@@ -72,22 +73,22 @@ fn exec_cargo_with_args(args: &[&str]) -> Vec<PathBuf> {
             let path = fpath.as_str().expect("file name not a string");
             let path = PathBuf::from(path);
 
-            if path.extension().is_some_and(|ex| ex == "rlib") {
+            if CHECK_EXTENSIONS.contains(&path.extension().map(|ex| ex.to_str().unwrap())) {
                 let fname = path.file_name().unwrap().to_str().unwrap();
 
                 if CHECK_LIBRARIES.iter().any(|lib| fname.contains(lib)) {
-                    rlibs.push(path);
+                    check_files.push(path);
                 }
             }
         }
     }
 
     cmd.wait().expect("failed to wait on Cargo");
 
-    assert!(!rlibs.is_empty(), "no compiler_builtins rlibs found");
-    println!("Collected the following rlibs to check: {rlibs:#?}");
+    assert!(!check_files.is_empty(), "no compiler_builtins rlibs found");
+    println!("Collected the following rlibs to check: {check_files:#?}");
 
-    rlibs
+    check_files
 }
 
 #[expect(unused)] // only for printing