From ef037e6d30b21363c48c47045b325a780fdde6d3 Mon Sep 17 00:00:00 2001
From: Antoni Boucher <bouanto@zoho.com>
Date: Sun, 11 Jun 2023 19:27:39 -0400
Subject: [PATCH] Fix tests

---
 build_sysroot/Cargo.toml | 1 +
 failing-ui-tests.txt     | 2 ++
 src/declare.rs           | 2 +-
 test.sh                  | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build_sysroot/Cargo.toml b/build_sysroot/Cargo.toml
index cfadf47cc3f..a84f86a8218 100644
--- a/build_sysroot/Cargo.toml
+++ b/build_sysroot/Cargo.toml
@@ -9,6 +9,7 @@ compiler_builtins = "0.1"
 alloc = { path = "./sysroot_src/library/alloc" }
 std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtrace"] }
 test = { path = "./sysroot_src/library/test" }
+proc_macro = { path = "./sysroot_src/library/proc_macro" }
 
 [patch.crates-io]
 rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" }
diff --git a/failing-ui-tests.txt b/failing-ui-tests.txt
index 1b0e30c920a..801464daae9 100644
--- a/failing-ui-tests.txt
+++ b/failing-ui-tests.txt
@@ -66,3 +66,5 @@ tests/ui/generator/panic-safe.rs
 tests/ui/issues/issue-14875.rs
 tests/ui/issues/issue-29948.rs
 tests/ui/panic-while-printing.rs
+tests/ui/enum-discriminant/get_discr.rs
+tests/ui/panics/nested_panic_caught.rs
diff --git a/src/declare.rs b/src/declare.rs
index 4748e7e4be2..493626c3cf5 100644
--- a/src/declare.rs
+++ b/src/declare.rs
@@ -132,7 +132,7 @@ fn declare_raw_fn<'gcc>(cx: &CodegenCx<'gcc, '_>, name: &str, _callconv: () /*ll
 pub fn mangle_name(name: &str) -> String {
     name.replace(|char: char| {
         if !char.is_alphanumeric() && char != '_' {
-            debug_assert!("$.".contains(char), "Unsupported char in function name: {}", char);
+            debug_assert!("$.*".contains(char), "Unsupported char in function name {}: {}", name, char);
             true
         }
         else {
diff --git a/test.sh b/test.sh
index 7c68e00771d..72753e1d466 100755
--- a/test.sh
+++ b/test.sh
@@ -350,6 +350,8 @@ function test_rustc() {
     for test in $(rg -i --files-with-matches "//(\[\w+\])?~|// error-pattern:|// build-fail|// run-fail|-Cllvm-args" tests/ui); do
       rm $test
     done
+    rm tests/ui/consts/const_cmp_type_id.rs
+    rm tests/ui/consts/issue-73976-monomorphic.rs
 
     git checkout -- tests/ui/issues/auxiliary/issue-3136-a.rs # contains //~ERROR, but shouldn't be removed