update

Author: tgross35

ci/run.sh

@@ -47,7 +47,6 @@ else
     fi
 fi
 
-# Remove any existing artifacts from previous tests that don't set #![compiler_builtins]
 symcheck=(cargo run -p symbol-check)
 [[ "$target" = "wasm"* ]] && symcheck+=(--features wasm)
 symcheck+=(-- build-and-check)
@@ -61,61 +60,7 @@ symcheck+=(-- build-and-check)
 "${symcheck[@]}" -p compiler_builtins --target "$target" --features no-f16-f128
 "${symcheck[@]}" -p compiler_builtins --target "$target" --features no-f16-f128 --release
 
-# # Look out for duplicated symbols when we include the compiler-rt (C) implementation
-# for_each_rlib "${symcheck[@]}" -- check-duplicates
-# for_each_rlib rm -f
-
-# PREFIX=${target//unknown-/}-
-# case "$target" in
-#     armv7-*)
-#         PREFIX=arm-linux-gnueabihf-
-#         ;;
-#     thumb*)
-#         PREFIX=arm-none-eabi-
-#         ;;
-#     *86*-*)
-#         PREFIX=
-#         ;;
-# esac
-
-# NM=$(find "$(rustc --print sysroot)" \( -name llvm-nm -o -name llvm-nm.exe \) )
-# if [ "$NM" = "" ]; then
-#   NM="${PREFIX}nm"
-# fi
-
-# # i686-pc-windows-gnu tools have a dependency on some DLLs, so run it with
-# # rustup run to ensure that those are in PATH.
-# TOOLCHAIN="$(rustup show active-toolchain | sed 's/ (default)//')"
-# if [[ "$TOOLCHAIN" == *i686-pc-windows-gnu ]]; then
-#   NM="rustup run $TOOLCHAIN $NM"
-# fi
-
-# # Look out for duplicated symbols when we include the compiler-rt (C) implementation
-# update_rlib_paths
-# for rlib in "${rlib_paths[@]}"; do
-#     set +x
-#     echo "================================================================"
-#     echo "checking $rlib for duplicate symbols"
-#     echo "================================================================"
-#     set -x
-    
-#     duplicates_found=0
-
-#     # NOTE On i586, It's normal that the get_pc_thunk symbol appears several
-#     # times so ignore it
-#     $NM -g --defined-only "$rlib" 2>&1 |
-#       sort |
-#       uniq -d |
-#       grep -v __x86.get_pc_thunk --quiet |
-#       grep 'T __' && duplicates_found=1
-
-#     if [ "$duplicates_found" != 0 ]; then
-#         echo "error: found duplicate symbols"
-#         exit 1
-#     else
-#         echo "success; no duplicate symbols found"
-#     fi
-# done
+# Look out for duplicated symbols when we include the compiler-rt (C) implementation
 
 build_intrinsics_test() {
     "${symcheck[@]}" \
@@ -134,39 +79,6 @@ 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
-
-# # Ensure no references to any symbols from core
-# update_rlib_paths
-# for rlib in "${rlib_paths[@]}"; do
-#     set +x
-#     echo "================================================================"
-#     echo "checking $rlib for references to core"
-#     echo "================================================================"
-#     set -x
-
-#     tmpdir="${CARGO_TARGET_DIR:-target}/tmp"
-#     test -d "$tmpdir" || mkdir "$tmpdir"
-#     defined="$tmpdir/defined_symbols.txt"
-#     undefined="$tmpdir/defined_symbols.txt"
-
-#     $NM --quiet -U "$rlib" | grep 'T _ZN4core' | awk '{print $3}' | sort | uniq > "$defined"
-#     $NM --quiet -u "$rlib" | grep 'U _ZN4core' | awk '{print $2}' | sort | uniq > "$undefined"
-#     grep_has_results=0
-#     grep -v -F -x -f "$defined" "$undefined" && grep_has_results=1
-
-#     if [ "$target" = "powerpc64-unknown-linux-gnu" ]; then
-#         echo "FIXME: powerpc64 fails these tests"
-#     elif [ "$grep_has_results" != 0 ]; then
-#         echo "error: found unexpected references to core"
-#         exit 1
-#     else
-#         echo "success; no references to core found"
-#     fi
-# done
-
-
-
 # Test libm
 
 # Make sure a simple build works

crates/symbol-check/src/main.rs

@@ -169,9 +169,11 @@ 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;
+    let mut has_symbols = false;
 
     for_each_symbol(path, |sym, member| {
+        has_symbols = true;
+
         // Find only symbols from `core`
         if !sym.name().unwrap().contains("_ZN4core") {
             return;
@@ -183,11 +185,9 @@ fn verify_core_symbols(path: impl AsRef<Path>) {
         } else {
             defined.insert(info.name);
         }
-
-        found_any = true;
     });
 
-    assert!(found_any, "no symbols found");
+    assert!(has_symbols, "no symbols found");
 
     // Discard any symbols that are defined somewhere in the archive
     undefined.retain(|sym| !defined.contains(&sym.name));