rewrite allocator-shim-circular-deps to ui test

rust-lang · Jun 17, 2024 · 184dcf2 · 184dcf2
1 parent dfba1b5
commit 184dcf2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -1,4 +1,3 @@
-run-make/allocator-shim-circular-deps/Makefile
 run-make/archive-duplicate-names/Makefile
 run-make/atomic-lock-free/Makefile
 run-make/branch-protection-check-IBT/Makefile

diff --git a/tests/run-make/allocator-shim-circular-deps/Makefile b/tests/run-make/allocator-shim-circular-deps/Makefile
diff --git a/tests/run-make/allocator-shim-circular-deps/main.rs b/tests/run-make/allocator-shim-circular-deps/main.rs
diff --git a/tests/ui/issues/allocator-shim-circular-deps.rs b/tests/ui/issues/allocator-shim-circular-deps.rs
@@ -0,0 +1,20 @@
+// This test is designed to intentionally introduce a circular dependency scenario to check
+// that a specific compiler bug doesn't make a resurgence.
+// The bug in question arose when at least one crate
+// required a global allocator, and that crate was placed after
+// the one defining it in the linker order.
+// The generated symbols.o should not result in any linker errors.
+// See https://github.com/rust-lang/rust/issues/112715
+
+//@ ignore-cross-compile
+//@ check-pass
+//@ compile-flags: --test
+//@ aux-build: my_lib.rs
+
+#[crate_type = "bin"]
+
+extern crate my_lib;
+
+fn main() {
+    my_lib::do_something();
+}
diff --git a/...ke/allocator-shim-circular-deps/my_lib.rs → tests/ui/issues/auxiliary/my_lib.rs b/...ke/allocator-shim-circular-deps/my_lib.rs → tests/ui/issues/auxiliary/my_lib.rs