Skip to content

Commit cce1476

Browse files
borsbors
committed
Auto merge of #129018 - Oneirical:nmemonic-artifice, r=<try>
Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). Please try: try-job: x86_64-msvc try-job: test-various
2 parents e08b80c + fe94c51 commit cce1476

File tree

6 files changed

+172
-79
lines changed

6 files changed

+172
-79
lines changed

‎src/tools/run-make-support/src/external_deps/llvm.rs

+6
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,12 @@ impl LlvmAr {
277277
self
278278
}
279279

280+
/// Print the table of contents.
281+
pub fn table_of_contents(&mut self) -> &mut Self {
282+
self.cmd.arg("t");
283+
self
284+
}
285+
280286
/// Provide an output, then an input file. Bundled in one function, as llvm-ar has
281287
/// no "--output"-style flag.
282288
pub fn output_input(&mut self, out: impl AsRef<Path>, input: impl AsRef<Path>) -> &mut Self {

‎src/tools/tidy/src/allowed_run_make_makefiles.txt

-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ run-make/libtest-junit/Makefile
1414
run-make/libtest-thread-limit/Makefile
1515
run-make/macos-deployment-target/Makefile
1616
run-make/min-global-align/Makefile
17-
run-make/native-link-modifier-bundle/Makefile
1817
run-make/no-alloc-shim/Makefile
1918
run-make/remap-path-prefix-dwarf/Makefile
2019
run-make/reproducible-build/Makefile
21-
run-make/rlib-format-packed-bundled-libs/Makefile
2220
run-make/split-debuginfo/Makefile
2321
run-make/symbol-mangling-hashed/Makefile
2422
run-make/sysroot-crates-are-unstable/Makefile

‎tests/run-make/native-link-modifier-bundle/Makefile

-38
This file was deleted.

‎tests/run-make/native-link-modifier-bundle/rmake.rs

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
// This test exercises the `bundle` link argument, which can be turned on or off.
2+
3+
// When building a rlib or staticlib, +bundle means that all object files from the native static
4+
// library will be added to the rlib or staticlib archive, and then used from it during linking of
5+
// the final binary.
6+
7+
// When building a rlib -bundle means that the native static library is registered as a dependency
8+
// of that rlib "by name", and object files from it are included only during linking of the final
9+
// binary, the file search by that name is also performed during final linking.
10+
// When building a staticlib -bundle means that the native static library is simply not included
11+
// into the archive and some higher level build system will need to add it later during linking of
12+
// the final binary.
13+
14+
// This modifier has no effect when building other targets like executables or dynamic libraries.
15+
16+
// The default for this modifier is +bundle.
17+
// See https://github.com/rust-lang/rust/pull/95818
18+
19+
// FIXME(Oneirical): cross compile and MSVC
20+
21+
use run_make_support::{
22+
build_native_static_lib, dynamic_lib_name, llvm_nm, rust_lib_name, rustc, static_lib_name,
23+
};
24+
25+
fn main() {
26+
build_native_static_lib("native-staticlib");
27+
// Build a staticlib and a rlib, the `native_func` symbol will be bundled into them
28+
rustc().input("bundled.rs").crate_type("staticlib").crate_type("rlib").run();
29+
llvm_nm()
30+
.input(static_lib_name("bundled"))
31+
.run()
32+
.assert_stdout_contains_regex("T _*native_func");
33+
llvm_nm()
34+
.input(static_lib_name("bundled"))
35+
.run()
36+
.assert_stdout_contains_regex("U _*native_func");
37+
llvm_nm().input(rust_lib_name("bundled")).run().assert_stdout_contains_regex("T _*native_func");
38+
llvm_nm().input(rust_lib_name("bundled")).run().assert_stdout_contains_regex("U _*native_func");
39+
40+
// Build a staticlib and a rlib, the `native_func` symbol will not be bundled into it
41+
build_native_static_lib("native-staticlib");
42+
rustc().input("non-bundled.rs").crate_type("staticlib").crate_type("rlib").run();
43+
llvm_nm()
44+
.input(static_lib_name("non_bundled"))
45+
.run()
46+
.assert_stdout_not_contains_regex("T _*native_func");
47+
llvm_nm()
48+
.input(static_lib_name("non_bundled"))
49+
.run()
50+
.assert_stdout_contains_regex("U _*native_func");
51+
llvm_nm()
52+
.input(rust_lib_name("non_bundled"))
53+
.run()
54+
.assert_stdout_not_contains_regex("T _*native_func");
55+
llvm_nm()
56+
.input(rust_lib_name("non_bundled"))
57+
.run()
58+
.assert_stdout_contains_regex("U _*native_func");
59+
60+
// Build a cdylib, `native-staticlib` will not appear on the linker line because it was bundled
61+
// previously. The cdylib will contain the `native_func` symbol in the end.
62+
rustc()
63+
.input("cdylib-bundled.rs")
64+
.crate_type("cdylib")
65+
.print("link-args")
66+
.run()
67+
.assert_stdout_not_contains(r#"-l[" ]*native-staticlib"#);
68+
llvm_nm()
69+
.input(dynamic_lib_name("cdylib_bundled"))
70+
.run()
71+
.assert_stdout_contains_regex("[Tt] _*native_func");
72+
73+
// Build a cdylib, `native-staticlib` will appear on the linker line because it was not bundled
74+
// previously. The cdylib will contain the `native_func` symbol in the end
75+
rustc()
76+
.input("cdylib-non-bundled.rs")
77+
.crate_type("cdylib")
78+
.print("link-args")
79+
.run()
80+
.assert_stdout_contains_regex(r#"-l[" ]*native-staticlib"#);
81+
llvm_nm()
82+
.input(dynamic_lib_name("cdylib_non_bundled"))
83+
.run()
84+
.assert_stdout_contains_regex("[Tt] _*native_func");
85+
}

‎tests/run-make/rlib-format-packed-bundled-libs/Makefile

-39
This file was deleted.

‎tests/run-make/rlib-format-packed-bundled-libs/rmake.rs

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// `-Z packed_bundled_libs` is an unstable rustc flag that makes the compiler
2+
// only require a native library and no supplementary object files to compile.
3+
// Output files compiled with this flag should still contain all expected symbols -
4+
// that is what this test checks.
5+
// See https://github.com/rust-lang/rust/pull/100101
6+
7+
// FIXME(Oneirical): MSVC and cross-compile
8+
9+
use run_make_support::{
10+
bin_name, build_native_static_lib, cwd, filename_contains, llvm_ar, llvm_nm, rfs,
11+
rust_lib_name, rustc, shallow_find_files,
12+
};
13+
14+
fn main() {
15+
build_native_static_lib("native_dep_1");
16+
build_native_static_lib("native_dep_2");
17+
build_native_static_lib("native_dep_3");
18+
rustc().input("rust_dep_up.rs").crate_type("rlib").arg("-Zpacked_bundled_libs").run();
19+
llvm_nm()
20+
.input(rust_lib_name("rust_dep_up"))
21+
.run()
22+
.assert_stdout_contains_regex("U.*native_f2");
23+
llvm_nm()
24+
.input(rust_lib_name("rust_dep_up"))
25+
.run()
26+
.assert_stdout_contains_regex("U.*native_f3");
27+
llvm_nm()
28+
.input(rust_lib_name("rust_dep_up"))
29+
.run()
30+
.assert_stdout_contains_regex("T.*rust_dep_up");
31+
llvm_ar()
32+
.table_of_contents()
33+
.arg(rust_lib_name("rust_dep_up"))
34+
.run()
35+
.assert_stdout_contains("native_dep_2");
36+
llvm_ar()
37+
.table_of_contents()
38+
.arg(rust_lib_name("rust_dep_up"))
39+
.run()
40+
.assert_stdout_contains("native_dep_3");
41+
rustc()
42+
.input("rust_dep_local.rs")
43+
.extern_("rlib", rust_lib_name("rust_dep_up"))
44+
.arg("-Zpacked_bundled_libs")
45+
.crate_type("rlib")
46+
.run();
47+
llvm_nm()
48+
.input(rust_lib_name("rust_dep_local"))
49+
.run()
50+
.assert_stdout_contains_regex("U.*native_f1");
51+
llvm_nm()
52+
.input(rust_lib_name("rust_dep_local"))
53+
.run()
54+
.assert_stdout_contains_regex("T.*rust_dep_local");
55+
llvm_ar()
56+
.table_of_contents()
57+
.arg(rust_lib_name("rust_dep_local"))
58+
.run()
59+
.assert_stdout_contains("native_dep_1");
60+
61+
// Ensure the compiler will not use files it should not know about.
62+
for file in shallow_find_files(cwd(), |path| filename_contains(path, "native_dep_")) {
63+
rfs::remove_file(file);
64+
}
65+
66+
rustc()
67+
.input("main.rs")
68+
.extern_("lib", rust_lib_name("rust_dep_local"))
69+
.output(bin_name("main"))
70+
.arg("-Zpacked_bundled_libs")
71+
.print("link-args")
72+
.run()
73+
.assert_stdout_contains_regex("native_dep_1.*native_dep_2.*native_dep_3");
74+
75+
//FIXME(Oneirical): This part will apparently fail on MSVC
76+
llvm_nm().input(bin_name("main")).run().assert_stdout_contains_regex("T.*native_f1");
77+
llvm_nm().input(bin_name("main")).run().assert_stdout_contains_regex("T.*native_f2");
78+
llvm_nm().input(bin_name("main")).run().assert_stdout_contains_regex("T.*native_f3");
79+
llvm_nm().input(bin_name("main")).run().assert_stdout_contains_regex("T.*rust_dep_local");
80+
llvm_nm().input(bin_name("main")).run().assert_stdout_contains_regex("T.*rust_dep_up");
81+
}

0 commit comments

Comments
 (0)