debug

Author: tgross35

ci/run.sh

@@ -47,6 +47,37 @@ else
     fi
 fi
 
+PREFIX=${target//unknown-/}-
+case "$target" in
+    armv7-*)
+        PREFIX=arm-linux-gnueabihf-
+        ;;
+    thumb*)
+        PREFIX=arm-none-eabi-
+        ;;
+    *86*-*)
+        PREFIX=
+        ;;
+esac
+
+cat << EOF > run-rust-nm
+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
+
+$NM "$@""
+EOF
+
+chmod +x run-rust-nm
+
 symcheck=(cargo run -p symbol-check)
 [[ "$target" = "wasm"* ]] && symcheck+=(--features wasm)
 symcheck+=(-- build-and-check)

crates/symbol-check/src/main.rs

@@ -129,17 +129,25 @@ fn verify_no_duplicates(path: impl AsRef<Path>) {
     let mut dups = Vec::new();
     let mut found_any = false;
 
-    for_each_symbol(path, |sym, member| {
-        // Only check defined globals, exclude wasm file symbols
-        if !sym.is_global() || sym.is_undefined()
-        // || sym.kind() == SymbolKind::File
-        {
+    for_each_symbol(&path, |sym, member| {
+        // Only check defined globals
+        if !sym.is_global() || sym.is_undefined() {
             return;
         }
 
         let info = SymInfo::new(&sym, member);
+
+        // x86-32 includes multiple copies of thunk symbols
         if info.name.starts_with("__x86.get_pc_thunk") {
-            // x86-32 includes multiple copies of thunk symbols
+            return;
+        }
+
+        // Ignore literal constants on Windows
+        let win_allowed_dup_pfx = ["__real@", "__xmm@"];
+        if win_allowed_dup_pfx
+            .iter()
+            .any(|pfx| info.name.starts_with(pfx))
+        {
             return;
         }
 
@@ -158,14 +166,14 @@ fn verify_no_duplicates(path: impl AsRef<Path>) {
 
     assert!(found_any, "no symbols found");
 
-    if cfg!(windows) {
-        // Ignore literal constants
-        let allowed_dup_pfx = ["__real@", "__xmm@"];
-        dups.retain(|sym| !allowed_dup_pfx.iter().any(|pfx| sym.name.starts_with(pfx)));
-    }
-
     if !dups.is_empty() {
         dups.sort_unstable_by(|a, b| a.name.cmp(&b.name));
+
+        Command::new("run-rust-nm")
+            .arg(path.as_ref())
+            .status()
+            .unwrap();
+
         panic!("found duplicate symbols: {dups:#?}");
     }