Migrate incr-add-rust-src-component and issue-84395-lto-embed-bitcode run-make tests to rmake

src/tools/tidy/src/allowed_run_make_makefiles.txt

@@ -5,8 +5,6 @@ run-make/dep-info-spaces/Makefile
 run-make/dep-info/Makefile
 run-make/emit-to-stdout/Makefile
 run-make/extern-fn-reachable/Makefile
-run-make/incr-add-rust-src-component/Makefile
-run-make/issue-84395-lto-embed-bitcode/Makefile
 run-make/jobserver-error/Makefile
 run-make/libs-through-symlinks/Makefile
 run-make/libtest-json/Makefile

tests/run-make/incr-add-rust-src-component/rmake.rs

@@ -0,0 +1,39 @@
+// rust-lang/rust#70924: Test that if we add rust-src component in between
+// two incremental compiles, the compiler does not ICE on the second.
+// Remove the rust-src part of the sysroot for the *first* build.
+// Then put in a copy of the rust-src
+// component for the second build, in order to expose the ICE from issue #70924.
+// See https://github.com/rust-lang/rust/pull/72952
+
+//@ needs-symlink
+
+//FIXME(Oneirical): try on test-various
+
+use run_make_support::{path, rfs, rustc};
+
+fn main() {
+    let sysroot = rustc().print("sysroot").run().stdout_utf8();
+    let sysroot = sysroot.trim();
+    rfs::create_dir("fakeroot");
+    symlink_all_entries(&sysroot, "fakeroot");
+    rfs::remove_file("fakeroot/lib");
+    rfs::create_dir("fakeroot/lib");
+    symlink_all_entries(path(&sysroot).join("lib"), "fakeroot/lib");
+    rfs::remove_file("fakeroot/lib/rustlib");
+    rfs::create_dir("fakeroot/lib/rustlib");
+    symlink_all_entries(path(&sysroot).join("lib/rustlib"), "fakeroot/lib/rustlib");
+    rfs::remove_file("fakeroot/lib/rustlib/src");
+    rfs::create_dir("fakeroot/lib/rustlib/src");
+    symlink_all_entries(path(&sysroot).join("lib/rustlib/src"), "fakeroot/lib/rustlib/src");
+    rfs::remove_file("fakeroot/lib/rustlib/src/rust");
+    rustc().sysroot("fakeroot").incremental("incr").input("main.rs").run();
+    rfs::create_dir_all("fakeroot/lib/rustlib/src/rust/src/libstd");
+    rfs::create_file("fakeroot/lib/rustlib/src/rust/src/libstd/lib.rs");
+    rustc().sysroot("fakeroot").incremental("incr").input("main.rs").run();
+}
+
+fn symlink_all_entries<P: AsRef<std::path::Path>>(dir: P, fakepath: &str) {
+    for found_path in rfs::shallow_find_dir_entries(dir) {
+        rfs::create_symlink(&found_path, path(fakepath).join(found_path.file_name().unwrap()));
+    }
+}

tests/run-make/lto-embed-bitcode-clang/rmake.rs

@@ -0,0 +1,30 @@
+// This test checks that the embed bitcode in elf created with
+// lto-embed-bitcode=optimized is a valid llvm bitcode module.
+// Otherwise, the `test.bc` file will cause an error when
+// `llvm-dis` attempts to disassemble it.
+// See https://github.com/rust-lang/rust/issues/84395
+
+//@ needs-force-clang-based-tests
+// NOTE(#126180): This test only runs on `x86_64-gnu-debug`, because that CI job sets
+// RUSTBUILD_FORCE_CLANG_BASED_TESTS and only runs tests which contain "clang" in their
+// name.
+
+use run_make_support::llvm::llvm_bin_dir;
+use run_make_support::{cmd, env_var, rustc};
+
+fn main() {
+    rustc()
+        .input("test.rs")
+        .link_arg("-fuse-ld=lld")
+        .arg("-Clinker-plugin-lto")
+        .linker(&env_var("CLANG"))
+        .link_arg("-Wl,--plugin-opt=-lto-embed-bitcode=optimized")
+        .arg("-Zemit-thin-lto=no")
+        .run();
+    cmd(llvm_bin_dir().join("llvm-objcopy"))
+        .arg("--dump-section")
+        .arg(".llvmbc=test.bc")
+        .arg("test")
+        .run();
+    cmd(llvm_bin_dir().join("llvm-dis")).arg("test.bc").run();
+}