rust-bors · Oct 13, 2026 · Aug 4, 2026 · Aug 4, 2026 · Aug 4, 2026
diff --git a/compiler/rustc_sanitizers/src/cfi/typeid/itanium_cxx_abi/transform.rs b/compiler/rustc_sanitizers/src/cfi/typeid/itanium_cxx_abi/transform.rs
diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
@@ -2395,8 +2395,6 @@ ui/rust-2018/uniform-paths/issue-55779.rs
 ui/rust-2018/uniform-paths/issue-56596-2.rs
 ui/rust-2018/uniform-paths/issue-56596.rs
 ui/rust-2018/uniform-paths/issue-87932.rs
-ui/sanitizer/issue-111184-cfi-coroutine-witness.rs
-ui/sanitizer/issue-114275-cfi-const-expr-in-arry-len.rs
 ui/sanitizer/issue-72154-address-lifetime-markers.rs
 ui/self/issue-61882-2.rs
 ui/self/issue-61882.rs

diff --git a/...ssue-114275-cfi-const-expr-in-arry-len.rs → ...i/const-expr-in-array-len-issue-114275.rs b/...ssue-114275-cfi-const-expr-in-arry-len.rs → ...i/const-expr-in-array-len-issue-114275.rs
diff --git a/...zer/issue-111184-cfi-coroutine-witness.rs → ...zer/cfi/coroutine-witness-issue-111184.rs b/...zer/issue-111184-cfi-coroutine-witness.rs → ...zer/cfi/coroutine-witness-issue-111184.rs
@@ -6,8 +6,8 @@
 //@ edition: 2021
 //@ no-prefer-dynamic
 //@ only-x86_64-unknown-linux-gnu
-//@ build-pass
 //@ ignore-backends: gcc
+//@ build-pass
 
 use std::future::Future;
 

diff --git a/tests/ui/sanitizer/cfi/can-reveal-opaques.rs → ...itizer/cfi/reveal-opaques-issue-114160.rs b/tests/ui/sanitizer/cfi/can-reveal-opaques.rs → ...itizer/cfi/reveal-opaques-issue-114160.rs
@@ -1,12 +1,13 @@
+// Regression test for issue 114160, where the return type of the call could not be normalized
+// with a user-facing param-env, causing an ICE. (See the comment in main for the details.)
+//
 //@ needs-sanitizer-cfi
 //@ compile-flags: -Ccodegen-units=1 -Clto -Ctarget-feature=-crt-static -Zsanitizer=cfi -C unsafe-allow-abi-mismatch=sanitizer
 //@ no-prefer-dynamic
 //@ only-x86_64-unknown-linux-gnu
 //@ ignore-backends: gcc
 //@ build-pass
 
-// See comment below for why this test exists.
-
 trait Tr<U> {
     type Projection;
 }

diff --git a/.../sanitizer/split-lto-unit-requires-lto.rs → ...itizer/cfi/split-lto-unit-requires-lto.rs b/.../sanitizer/split-lto-unit-requires-lto.rs → ...itizer/cfi/split-lto-unit-requires-lto.rs
diff --git a/...itizer/split-lto-unit-requires-lto.stderr → ...er/cfi/split-lto-unit-requires-lto.stderr b/...itizer/split-lto-unit-requires-lto.stderr → ...er/cfi/split-lto-unit-requires-lto.stderr
diff --git a/.../ui/sanitizer/kcfi-arity-requires-kcfi.rs → .../ui/sanitizer/kcfi/arity-requires-kcfi.rs b/.../ui/sanitizer/kcfi-arity-requires-kcfi.rs → .../ui/sanitizer/kcfi/arity-requires-kcfi.rs
diff --git a/...sanitizer/kcfi-arity-requires-kcfi.stderr → ...sanitizer/kcfi/arity-requires-kcfi.stderr b/...sanitizer/kcfi-arity-requires-kcfi.stderr → ...sanitizer/kcfi/arity-requires-kcfi.stderr