rewrite and rename issue-40535 to rmake

rust-lang · bors · Jul 5, 2024 · Apr 23, 2024 · Apr 23, 2024 · Jul 1, 2024
commit 5e23dfea9dee65b8a5b7ed54354b4c46d38f12ca
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -63,7 +63,6 @@ run-make/issue-33329/Makefile
 run-make/issue-35164/Makefile
 run-make/issue-36710/Makefile
 run-make/issue-37839/Makefile
-run-make/issue-40535/Makefile
 run-make/issue-47551/Makefile
 run-make/issue-69368/Makefile
 run-make/issue-83045/Makefile

diff --git a/tests/run-make/issue-40535/Makefile b/tests/run-make/issue-40535/Makefile
diff --git a/tests/run-make/issue-40535/bar.rs → ...un-make/metadata-only-crate-no-ice/bar.rs b/tests/run-make/issue-40535/bar.rs → ...un-make/metadata-only-crate-no-ice/bar.rs
diff --git a/tests/run-make/issue-40535/baz.rs → ...un-make/metadata-only-crate-no-ice/baz.rs b/tests/run-make/issue-40535/baz.rs → ...un-make/metadata-only-crate-no-ice/baz.rs
diff --git a/tests/run-make/issue-40535/foo.rs → ...un-make/metadata-only-crate-no-ice/foo.rs b/tests/run-make/issue-40535/foo.rs → ...un-make/metadata-only-crate-no-ice/foo.rs
diff --git a/tests/run-make/metadata-only-crate-no-ice/rmake.rs b/tests/run-make/metadata-only-crate-no-ice/rmake.rs
@@ -0,0 +1,14 @@
+// In a dependency hierarchy, metadata-only crates could cause an Internal
+// Compiler Error (ICE) due to a compiler bug - not correctly fetching sources for
+// metadata-only crates. This test is a minimal reproduction of a program that triggered
+// this bug, and checks that no ICE occurs.
+// See https://github.com/rust-lang/rust/issues/40535
+
+use run_make_support::rustc;
+
+fn main() {
+    rustc().input("baz.rs").emit("metadata").run();
+    rustc().input("bar.rs").emit("metadata").extern_("baz", "libbaz.rmeta").run();
+    // There should be no internal compiler error message.
+    rustc().input("foo.rs").emit("metadata").extern_("bar", "libbaz.rmeta").run().assert_stderr_not_contains("unexpectedly panicked");
+}