update

Author: tgross35

ci/run.sh

@@ -47,27 +47,7 @@ else
     fi
 fi
 
-
-# Run a command for each `compiler_builtins` rlib file
-for_each_rlib() {
-    shopt -s nullglob
-    if [ -d /builtins-target ]; then
-        rlib_paths=( /builtins-target/"${target}"/debug/deps/libcompiler_builtins-*.rlib )
-    else
-        rlib_paths=( target/"${target}"/debug/deps/libcompiler_builtins-*.rlib )
-    fi
-
-    if [ "${#rlib_paths[@]}" -lt 1 ]; then
-        echo "rlibs expected but not found"
-        exit 1
-    fi
-
-    "$@" "${rlib_paths[@]}"
-}
-
-
 # Remove any existing artifacts from previous tests that don't set #![compiler_builtins]
-for_each_rlib rm
 symcheck=(cargo run -p symbol-check)
 [[ "$target" = "wasm"* ]] && symcheck+=(--features wasm)
 symcheck+=(-- build-and-check)
@@ -137,8 +117,6 @@ symcheck+=(-- build-and-check)
 #     fi
 # done
 
-for_each_rlib rm
-
 build_intrinsics_test() {
     "${symcheck[@]}" \
         --target "$target" --verbose \
@@ -156,7 +134,7 @@ build_intrinsics_test --features c --release
 CARGO_PROFILE_DEV_LTO=true build_intrinsics_test
 CARGO_PROFILE_RELEASE_LTO=true build_intrinsics_test --release
 
-for_each_rlib "${symcheck[@]}" -- check-core-syms
+# for_each_rlib "${symcheck[@]}" -- check-core-syms
 
 # # Ensure no references to any symbols from core
 # update_rlib_paths

crates/symbol-check/src/main.rs

@@ -127,6 +127,7 @@ impl SymInfo {
 fn verify_no_duplicates(path: impl AsRef<Path>) {
     let mut syms = BTreeMap::<String, SymInfo>::new();
     let mut dups = Vec::new();
+    let mut found_any = false;
 
     for_each_symbol(path, |sym, member| {
         // Only check defined globals, exclude wasm file symbols
@@ -144,8 +145,12 @@ fn verify_no_duplicates(path: impl AsRef<Path>) {
                 syms.insert(info.name.clone(), info);
             }
         }
+
+        found_any = true;
     });
 
+    assert!(found_any, "no symbols found");
+
     if cfg!(windows) {
         // Ignore literal constants
         let allowed_dup_pfx = ["__real@", "__xmm@"];
@@ -164,6 +169,7 @@ fn verify_no_duplicates(path: impl AsRef<Path>) {
 fn verify_core_symbols(path: impl AsRef<Path>) {
     let mut defined = BTreeSet::new();
     let mut undefined = Vec::new();
+    let mut found_any = false;
 
     for_each_symbol(path, |sym, member| {
         // Find only symbols from `core`
@@ -177,8 +183,12 @@ fn verify_core_symbols(path: impl AsRef<Path>) {
         } else {
             defined.insert(info.name);
         }
+
+        found_any = true;
     });
 
+    assert!(found_any, "no symbols found");
+
     // Discard any symbols that are defined somewhere in the archive
     undefined.retain(|sym| !defined.contains(&sym.name));