From 0c8f19473748487a8d3282dec694169e3f79da9f Mon Sep 17 00:00:00 2001 From: Oneirical Date: Tue, 23 Jul 2024 14:21:45 -0400 Subject: [PATCH 1/4] rewrite share-generics-dylib to rmake --- .../tidy/src/allowed_run_make_makefiles.txt | 1 - tests/run-make/share-generics-dylib/Makefile | 23 ------------- tests/run-make/share-generics-dylib/rmake.rs | 32 +++++++++++++++++++ 3 files changed, 32 insertions(+), 24 deletions(-) delete mode 100644 tests/run-make/share-generics-dylib/Makefile create mode 100644 tests/run-make/share-generics-dylib/rmake.rs diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index 7284feadf9cdd..3f416448f6d1e 100644 --- a/src/tools/tidy/src/allowed_run_make_makefiles.txt +++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt @@ -50,7 +50,6 @@ run-make/reproducible-build-2/Makefile run-make/reproducible-build/Makefile run-make/rlib-format-packed-bundled-libs-2/Makefile run-make/rlib-format-packed-bundled-libs/Makefile -run-make/share-generics-dylib/Makefile run-make/simd-ffi/Makefile run-make/split-debuginfo/Makefile run-make/stable-symbol-names/Makefile diff --git a/tests/run-make/share-generics-dylib/Makefile b/tests/run-make/share-generics-dylib/Makefile deleted file mode 100644 index 9d97eca80d3f5..0000000000000 --- a/tests/run-make/share-generics-dylib/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ignore-cross-compile -# This test makes sure all generic instances get re-exported from Rust dylibs for use by -# `-Zshare-generics`. There are two rlibs (`instance_provider_a` and `instance_provider_b`) -# which both provide an instance of `Cell::set`. There is `instance_user_dylib` which is -# supposed to re-export both these instances, and then there are `instance_user_a_rlib` and -# `instance_user_b_rlib` which each rely on a specific instance to be available. -# -# In the end everything is linked together into `linked_leaf`. If `instance_user_dylib` does -# not export both then we'll get an `undefined reference` error for one of the instances. -# -# This is regression test for https://github.com/rust-lang/rust/issues/67276. - -include ../tools.mk - -COMMON_ARGS=-Cprefer-dynamic -Zshare-generics=yes -Ccodegen-units=1 -Csymbol-mangling-version=v0 - -all: - $(RUSTC) instance_provider_a.rs $(COMMON_ARGS) --crate-type=rlib - $(RUSTC) instance_provider_b.rs $(COMMON_ARGS) --crate-type=rlib - $(RUSTC) instance_user_dylib.rs $(COMMON_ARGS) --crate-type=dylib - $(RUSTC) instance_user_a_rlib.rs $(COMMON_ARGS) --crate-type=rlib - $(RUSTC) instance_user_b_rlib.rs $(COMMON_ARGS) --crate-type=rlib - $(RUSTC) linked_leaf.rs $(COMMON_ARGS) --crate-type=bin diff --git a/tests/run-make/share-generics-dylib/rmake.rs b/tests/run-make/share-generics-dylib/rmake.rs new file mode 100644 index 0000000000000..8dd402ea1b6eb --- /dev/null +++ b/tests/run-make/share-generics-dylib/rmake.rs @@ -0,0 +1,32 @@ +// This test makes sure all generic instances get re-exported from Rust dylibs for use by +// `-Zshare-generics`. There are two rlibs (`instance_provider_a` and `instance_provider_b`) +// which both provide an instance of `Cell::set`. There is `instance_user_dylib` which is +// supposed to re-export both these instances, and then there are `instance_user_a_rlib` and +// `instance_user_b_rlib` which each rely on a specific instance to be available. +// +// In the end everything is linked together into `linked_leaf`. If `instance_user_dylib` does +// not export both then we'll get an `undefined reference` error for one of the instances. +// +// This is regression test for https://github.com/rust-lang/rust/issues/67276. + +//FIXME(Oneirical): ignore-cross-compile + +use run_make_support::rustc; + +fn main() { + compile("rlib", "instance_provider_a.rs"); + compile("rlib", "instance_provider_b.rs"); + compile("dylib", "instance_user_dylib.rs"); + compile("rlib", "instance_user_a_rlib.rs"); + compile("rlib", "instance_user_b_rlib.rs"); + compile("bin", "linked_leaf.rs"); +} + +fn compile(crate_type: &str, input: &str) { + rustc() + .input(input) + .crate_type(crate_type) + .args(&["-Cprefer-dynamic", "-Zshare-generics=yes", "-Csymbol-mangling-version=v0"]) + .codegen_units(1) + .run(); +} From 8c09a7f11e1c5d3c595bb64beb1e493bc08cbd1a Mon Sep 17 00:00:00 2001 From: Oneirical Date: Tue, 23 Jul 2024 15:41:53 -0400 Subject: [PATCH 2/4] rewrite raw-dylib-import-name-type to rmake --- .../tidy/src/allowed_run_make_makefiles.txt | 1 - .../raw-dylib-import-name-type/Makefile | 17 --------- .../raw-dylib-import-name-type/rmake.rs | 36 +++++++++++++++++++ 3 files changed, 36 insertions(+), 18 deletions(-) delete mode 100644 tests/run-make/raw-dylib-import-name-type/Makefile create mode 100644 tests/run-make/raw-dylib-import-name-type/rmake.rs diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index 3f416448f6d1e..fb72662405c97 100644 --- a/src/tools/tidy/src/allowed_run_make_makefiles.txt +++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt @@ -41,7 +41,6 @@ run-make/print-calling-conventions/Makefile run-make/print-target-list/Makefile run-make/raw-dylib-alt-calling-convention/Makefile run-make/raw-dylib-c/Makefile -run-make/raw-dylib-import-name-type/Makefile run-make/raw-dylib-link-ordinal/Makefile run-make/raw-dylib-stdcall-ordinal/Makefile run-make/redundant-libs/Makefile diff --git a/tests/run-make/raw-dylib-import-name-type/Makefile b/tests/run-make/raw-dylib-import-name-type/Makefile deleted file mode 100644 index 901d3e861c21a..0000000000000 --- a/tests/run-make/raw-dylib-import-name-type/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Test the behavior of #[link(.., kind = "raw-dylib")] with alternative calling conventions. - -# only-x86 -# only-windows - -include ../tools.mk - -all: - $(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)" - $(call COMPILE_OBJ,"$(TMPDIR)"/extern.obj,extern.c) -ifdef IS_MSVC - $(CC) "$(TMPDIR)"/extern.obj extern.msvc.def -link -dll -out:"$(TMPDIR)"/extern.dll -noimplib -else - $(CC) "$(TMPDIR)"/extern.obj extern.gnu.def --no-leading-underscore -shared -o "$(TMPDIR)"/extern.dll -endif - "$(TMPDIR)"/driver > "$(TMPDIR)"/output.txt - $(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt diff --git a/tests/run-make/raw-dylib-import-name-type/rmake.rs b/tests/run-make/raw-dylib-import-name-type/rmake.rs new file mode 100644 index 0000000000000..4dc916610e05c --- /dev/null +++ b/tests/run-make/raw-dylib-import-name-type/rmake.rs @@ -0,0 +1,36 @@ +// `raw-dylib` is a Windows-specific attribute which emits idata sections for the items in the +// attached extern block, +// so they may be linked against without linking against an import library. +// To learn more, read https://github.com/rust-lang/rfcs/blob/master/text/2627-raw-dylib-kind.md +// This test uses this feature alongside `import_name_type`, which allows for customization +// of how Windows symbols will be named. The correctness of this feature is checked by comparison +// with expected output. +// See https://github.com/rust-lang/rust/pull/100732 + +//@ only-x86 +//@ only-windows + +use run_make_support::{cc, diff, is_msvc, run, rustc}; + +// NOTE: build_native_dynamic lib is not used, as the special `def` files +// must be passed to the CC compiler. + +fn main() { + rustc().crate_type("bin").input("driver.rs").run(); + if is_msvc() { + cc().arg("-c").out_exe("extern").input("extern.c").run(); + cc().input("extern.obj") + .arg("extern.msvc.def") + .args(&["-link", "-dll", "-noimplib", "-out:extern.dll"]) + .run(); + } else { + cc().arg("-v").arg("-c").out_exe("extern.obj").input("extern.c").run(); + cc().input("extern.obj") + .arg("extern.gnu.def") + .args(&["--no-leading-underscore", "-shared"]) + .output("extern.dll") + .run(); + }; + let out = run("driver").stdout_utf8(); + diff().expected_file("output.txt").actual_text("actual", out).run(); +} From 9ffe161ce8a016fa98b6a6d6b269691cb3a44c46 Mon Sep 17 00:00:00 2001 From: Oneirical Date: Tue, 23 Jul 2024 15:50:25 -0400 Subject: [PATCH 3/4] rewrite raw-dylib-link-ordinal to rmake --- .../tidy/src/allowed_run_make_makefiles.txt | 1 - .../run-make/raw-dylib-link-ordinal/Makefile | 17 --------- .../run-make/raw-dylib-link-ordinal/rmake.rs | 38 +++++++++++++++++++ 3 files changed, 38 insertions(+), 18 deletions(-) delete mode 100644 tests/run-make/raw-dylib-link-ordinal/Makefile create mode 100644 tests/run-make/raw-dylib-link-ordinal/rmake.rs diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index fb72662405c97..fa4e489f902d0 100644 --- a/src/tools/tidy/src/allowed_run_make_makefiles.txt +++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt @@ -41,7 +41,6 @@ run-make/print-calling-conventions/Makefile run-make/print-target-list/Makefile run-make/raw-dylib-alt-calling-convention/Makefile run-make/raw-dylib-c/Makefile -run-make/raw-dylib-link-ordinal/Makefile run-make/raw-dylib-stdcall-ordinal/Makefile run-make/redundant-libs/Makefile run-make/remap-path-prefix-dwarf/Makefile diff --git a/tests/run-make/raw-dylib-link-ordinal/Makefile b/tests/run-make/raw-dylib-link-ordinal/Makefile deleted file mode 100644 index 3cf1300c243a4..0000000000000 --- a/tests/run-make/raw-dylib-link-ordinal/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Test the behavior of #[link(.., kind = "raw-dylib")] and #[link_ordinal] on windows-msvc - -# only-windows - -include ../tools.mk - -all: - $(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs - $(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)" - $(call COMPILE_OBJ,"$(TMPDIR)"/exporter.obj,exporter.c) -ifdef IS_MSVC - $(CC) "$(TMPDIR)"/exporter.obj exporter.def -link -dll -out:"$(TMPDIR)"/exporter.dll -noimplib -else - $(CC) "$(TMPDIR)"/exporter.obj exporter.def -shared -o "$(TMPDIR)"/exporter.dll -endif - "$(TMPDIR)"/driver | tr -d '\r' > "$(TMPDIR)"/output.txt - $(RUSTC_TEST_OP) "$(TMPDIR)"/output.txt output.txt diff --git a/tests/run-make/raw-dylib-link-ordinal/rmake.rs b/tests/run-make/raw-dylib-link-ordinal/rmake.rs new file mode 100644 index 0000000000000..c9bc9dea49e0f --- /dev/null +++ b/tests/run-make/raw-dylib-link-ordinal/rmake.rs @@ -0,0 +1,38 @@ +// `raw-dylib` is a Windows-specific attribute which emits idata sections for the items in the +// attached extern block, +// so they may be linked against without linking against an import library. +// To learn more, read https://github.com/rust-lang/rfcs/blob/master/text/2627-raw-dylib-kind.md +// `#[link_ordinal(n)]` allows Rust to link against DLLs that export symbols by ordinal rather +// than by name. As long as the ordinal matches, the name of the function in Rust is not +// required to match the name of the corresponding function in the exporting DLL. +// This test checks the correctness of this feature by comparing its output against expected +// output. +// See https://github.com/rust-lang/rust/pull/89025 + +//@ only-windows + +use run_make_support::{cc, diff, is_msvc, run, rustc}; + +// NOTE: build_native_dynamic lib is not used, as the special `def` files +// must be passed to the CC compiler. + +fn main() { + rustc().crate_type("lib").crate_name("raw_dylib_test").input("lib.rs").run(); + rustc().crate_type("bin").input("driver.rs").run(); + if is_msvc() { + cc().arg("-c").out_exe("exporter").input("exporter.c").run(); + cc().input("exporter.obj") + .arg("exporter.msvc.def") + .args(&["-link", "-dll", "-noimplib", "-out:exporter.dll"]) + .run(); + } else { + cc().arg("-v").arg("-c").out_exe("exporter.obj").input("exporter.c").run(); + cc().input("exporter.obj") + .arg("exporter.gnu.def") + .args(&["--no-leading-underscore", "-shared"]) + .output("exporter.dll") + .run(); + }; + let out = run("driver").stdout_utf8(); + diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run(); +} From 23cccb3fc6f0039a12582e80fda42041405bd407 Mon Sep 17 00:00:00 2001 From: Oneirical Date: Tue, 23 Jul 2024 15:59:18 -0400 Subject: [PATCH 4/4] rewrite raw-dylib-stdcall-ordinal to rmake --- .../tidy/src/allowed_run_make_makefiles.txt | 1 - .../raw-dylib-import-name-type/rmake.rs | 5 ++- .../run-make/raw-dylib-link-ordinal/rmake.rs | 10 ++--- .../raw-dylib-stdcall-ordinal/Makefile | 18 -------- .../raw-dylib-stdcall-ordinal/rmake.rs | 41 +++++++++++++++++++ tests/run-make/share-generics-dylib/rmake.rs | 2 - 6 files changed, 47 insertions(+), 30 deletions(-) delete mode 100644 tests/run-make/raw-dylib-stdcall-ordinal/Makefile create mode 100644 tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index fa4e489f902d0..a84b89ff4a113 100644 --- a/src/tools/tidy/src/allowed_run_make_makefiles.txt +++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt @@ -41,7 +41,6 @@ run-make/print-calling-conventions/Makefile run-make/print-target-list/Makefile run-make/raw-dylib-alt-calling-convention/Makefile run-make/raw-dylib-c/Makefile -run-make/raw-dylib-stdcall-ordinal/Makefile run-make/redundant-libs/Makefile run-make/remap-path-prefix-dwarf/Makefile run-make/reproducible-build-2/Makefile diff --git a/tests/run-make/raw-dylib-import-name-type/rmake.rs b/tests/run-make/raw-dylib-import-name-type/rmake.rs index 4dc916610e05c..13a2c99150e5b 100644 --- a/tests/run-make/raw-dylib-import-name-type/rmake.rs +++ b/tests/run-make/raw-dylib-import-name-type/rmake.rs @@ -3,12 +3,13 @@ // so they may be linked against without linking against an import library. // To learn more, read https://github.com/rust-lang/rfcs/blob/master/text/2627-raw-dylib-kind.md // This test uses this feature alongside `import_name_type`, which allows for customization -// of how Windows symbols will be named. The correctness of this feature is checked by comparison +// of how Windows symbols will be named. A sanity check of this feature is done by comparison // with expected output. // See https://github.com/rust-lang/rust/pull/100732 //@ only-x86 //@ only-windows +// Reason: this test specifically exercises a 32bit Windows calling convention. use run_make_support::{cc, diff, is_msvc, run, rustc}; @@ -32,5 +33,5 @@ fn main() { .run(); }; let out = run("driver").stdout_utf8(); - diff().expected_file("output.txt").actual_text("actual", out).run(); + diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run(); } diff --git a/tests/run-make/raw-dylib-link-ordinal/rmake.rs b/tests/run-make/raw-dylib-link-ordinal/rmake.rs index c9bc9dea49e0f..b52181ae3f9d6 100644 --- a/tests/run-make/raw-dylib-link-ordinal/rmake.rs +++ b/tests/run-make/raw-dylib-link-ordinal/rmake.rs @@ -5,7 +5,7 @@ // `#[link_ordinal(n)]` allows Rust to link against DLLs that export symbols by ordinal rather // than by name. As long as the ordinal matches, the name of the function in Rust is not // required to match the name of the corresponding function in the exporting DLL. -// This test checks the correctness of this feature by comparing its output against expected +// This test is a sanity check for this feature, done by comparing its output against expected // output. // See https://github.com/rust-lang/rust/pull/89025 @@ -22,16 +22,12 @@ fn main() { if is_msvc() { cc().arg("-c").out_exe("exporter").input("exporter.c").run(); cc().input("exporter.obj") - .arg("exporter.msvc.def") + .arg("exporter.def") .args(&["-link", "-dll", "-noimplib", "-out:exporter.dll"]) .run(); } else { cc().arg("-v").arg("-c").out_exe("exporter.obj").input("exporter.c").run(); - cc().input("exporter.obj") - .arg("exporter.gnu.def") - .args(&["--no-leading-underscore", "-shared"]) - .output("exporter.dll") - .run(); + cc().input("exporter.obj").arg("exporter.def").arg("-shared").output("exporter.dll").run(); }; let out = run("driver").stdout_utf8(); diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run(); diff --git a/tests/run-make/raw-dylib-stdcall-ordinal/Makefile b/tests/run-make/raw-dylib-stdcall-ordinal/Makefile deleted file mode 100644 index 70e4de62c1a9e..0000000000000 --- a/tests/run-make/raw-dylib-stdcall-ordinal/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Test the behavior of #[link(.., kind = "raw-dylib")], #[link_ordinal], and alternative calling conventions on i686 windows. - -# only-x86 -# only-windows - -include ../tools.mk - -all: - $(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs - $(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)" - $(call COMPILE_OBJ,"$(TMPDIR)"/exporter.obj,exporter.c) -ifdef IS_MSVC - $(CC) "$(TMPDIR)"/exporter.obj exporter-msvc.def -link -dll -out:"$(TMPDIR)"/exporter.dll -noimplib -else - $(CC) "$(TMPDIR)"/exporter.obj exporter-gnu.def -shared -o "$(TMPDIR)"/exporter.dll -endif - "$(TMPDIR)"/driver > "$(TMPDIR)"/actual_output.txt - $(RUSTC_TEST_OP) "$(TMPDIR)"/actual_output.txt expected_output.txt diff --git a/tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs b/tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs new file mode 100644 index 0000000000000..320ea1520d85f --- /dev/null +++ b/tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs @@ -0,0 +1,41 @@ +// `raw-dylib` is a Windows-specific attribute which emits idata sections for the items in the +// attached extern block, +// so they may be linked against without linking against an import library. +// To learn more, read https://github.com/rust-lang/rfcs/blob/master/text/2627-raw-dylib-kind.md +// Almost identical to `raw-dylib-link-ordinal`, but with the addition of calling conventions, +// such as stdcall. +// See https://github.com/rust-lang/rust/pull/90782 + +//@ only-x86 +//@ only-windows +// Reason: this test specifically exercises a 32bit Windows calling convention. + +use run_make_support::{cc, diff, is_msvc, run, rustc}; + +// NOTE: build_native_dynamic lib is not used, as the special `def` files +// must be passed to the CC compiler. + +fn main() { + rustc().crate_type("lib").crate_name("raw_dylib_test").input("lib.rs").run(); + rustc().crate_type("bin").input("driver.rs").run(); + if is_msvc() { + cc().arg("-c").out_exe("exporter").input("exporter.c").run(); + cc().input("exporter.obj") + .arg("exporter-msvc.def") + .args(&["-link", "-dll", "-noimplib", "-out:exporter.dll"]) + .run(); + } else { + cc().arg("-v").arg("-c").out_exe("exporter.obj").input("exporter.c").run(); + cc().input("exporter.obj") + .arg("exporter-gnu.def") + .arg("-shared") + .output("exporter.dll") + .run(); + }; + let out = run("driver").stdout_utf8(); + diff() + .expected_file("expected_output.txt") + .actual_text("actual", out) + .normalize(r#"\r"#, "") + .run(); +} diff --git a/tests/run-make/share-generics-dylib/rmake.rs b/tests/run-make/share-generics-dylib/rmake.rs index 8dd402ea1b6eb..e0e647fe19955 100644 --- a/tests/run-make/share-generics-dylib/rmake.rs +++ b/tests/run-make/share-generics-dylib/rmake.rs @@ -9,8 +9,6 @@ // // This is regression test for https://github.com/rust-lang/rust/issues/67276. -//FIXME(Oneirical): ignore-cross-compile - use run_make_support::rustc; fn main() {