Skip to content

Commit

Permalink
Auto merge of #128107 - Oneirical:tomato-hartester, r=<try>
Browse files Browse the repository at this point in the history
Migrate `raw-dylib-alt-calling-convention`, `raw-dylib-c` and `redundant-libs` `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: x86_64-mingw
  • Loading branch information
bors committed Jul 23, 2024
2 parents 84c257e + 2c740a2 commit ef5357b
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 82 deletions.
37 changes: 35 additions & 2 deletions src/tools/run-make-support/src/external_deps/c_build.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
use std::path::PathBuf;

use crate::artifact_names::static_lib_name;
use super::cygpath::get_windows_path;
use crate::artifact_names::{dynamic_lib_name, static_lib_name};
use crate::external_deps::cc::cc;
use crate::external_deps::llvm::llvm_ar;
use crate::path_helpers::path;
use crate::targets::is_msvc;
use crate::targets::{is_darwin, is_msvc, is_windows};

// FIXME(Oneirical): These native build functions should take a Path-based generic.

/// Builds a static lib (`.lib` on Windows MSVC and `.a` for the rest) with the given name.
#[track_caller]
Expand All @@ -25,3 +28,33 @@ pub fn build_native_static_lib(lib_name: &str) -> PathBuf {
llvm_ar().obj_to_ar().output_input(&lib_path, &obj_file).run();
path(lib_path)
}

/// Builds a dynamic lib. The filename is computed in a target-dependent manner, relying on
/// [`std::env::consts::DLL_PREFIX`] and [`std::env::consts::DLL_EXTENSION`].
#[track_caller]
pub fn build_native_dynamic_lib(lib_name: &str) -> PathBuf {
let obj_file = if is_msvc() { format!("{lib_name}") } else { format!("{lib_name}.o") };
let src = format!("{lib_name}.c");
let lib_path = dynamic_lib_name(lib_name);
if is_msvc() {
cc().arg("-c").out_exe(&obj_file).input(src).run();
} else {
cc().arg("-v").arg("-c").out_exe(&obj_file).input(src).run();
};
let obj_file = if is_msvc() { format!("{lib_name}.obj") } else { format!("{lib_name}.o") };
if is_msvc() {
let mut out_arg = "-out:".to_owned();
out_arg.push_str(&get_windows_path(&lib_path));
cc().input(&obj_file).args(&["-link", "-dll", &out_arg]).run();
} else if is_darwin() {
cc().out_exe(&lib_path).input(&obj_file).args(&["-dynamiclib", "-Wl,-dylib"]).run();
} else if is_windows() {
cc().out_exe(&lib_path)
.input(&obj_file)
.args(&["-shared", &format!("-Wl,--out-implib={lib_path}.a")])
.run();
} else {
cc().out_exe(&lib_path).input(&obj_file).arg("-shared").run();
}
path(lib_path)
}
2 changes: 1 addition & 1 deletion src/tools/run-make-support/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pub use wasmparser;
pub use external_deps::{c_build, cc, clang, htmldocck, llvm, python, rustc, rustdoc};

// These rely on external dependencies.
pub use c_build::build_native_static_lib;
pub use c_build::{build_native_static_lib, build_native_dynamic_lib};
pub use cc::{cc, extra_c_flags, extra_cxx_flags, Cc};
pub use clang::{clang, Clang};
pub use htmldocck::htmldocck;
Expand Down
3 changes: 0 additions & 3 deletions src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,9 @@ run-make/pgo-indirect-call-promotion/Makefile
run-make/pointer-auth-link-with-c/Makefile
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
run-make/remap-path-prefix-dwarf/Makefile
run-make/reproducible-build-2/Makefile
run-make/reproducible-build/Makefile
Expand Down
24 changes: 0 additions & 24 deletions tests/run-make/raw-dylib-alt-calling-convention/Makefile

This file was deleted.

28 changes: 28 additions & 0 deletions tests/run-make/raw-dylib-alt-calling-convention/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// `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 alternative calling conventions, checking that both
// features are compatible and result in the expected output upon execution of the binary.
// See https://github.com/rust-lang/rust/pull/84171

//@ only-x86
//@ only-windows

use run_make_support::{build_native_dynamic_lib, diff, is_msvc, run, run_with_args, rustc};

fn main() {
rustc()
.crate_type("lib")
.crate_name("raw_dylib_alt_calling_convention_test")
.input("lib.rs")
.run();
rustc().crate_type("bin").input("driver.rs").run();
build_native_dynamic_lib("extern");
let out = run("driver").stdout_utf8();
diff().expected_file("output.txt").actual_text("actual", out).run();
if is_msvc() {
let out_msvc = run_with_args("driver", &["true"]).stdout_utf8();
diff().expected_file("output.msvc.txt").actual_text("actual", out_msvc).run();
}
}
28 changes: 0 additions & 28 deletions tests/run-make/raw-dylib-c/Makefile

This file was deleted.

29 changes: 29 additions & 0 deletions tests/run-make/raw-dylib-c/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// `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 is the simplest of the raw-dylib tests, simply smoke-testing that the feature
// can be used to build an executable binary with an expected output with native C files
// compiling into dynamic libraries.
// See https://github.com/rust-lang/rust/pull/86419

//@ only-windows

use run_make_support::{build_native_dynamic_lib, diff, run, rustc};

fn main() {
rustc().crate_type("lib").crate_name("raw_dylib_test").input("lib.rs").run();
rustc().crate_type("bin").input("driver.rs").run();
rustc().crate_type("bin").crate_name("raw_dylib_test_bin").input("lib.rs").run();
build_native_dynamic_lib("extern_1");
build_native_dynamic_lib("extern_2");
let out_driver = run("driver").stdout_utf8();
let out_raw = run("raw_dylib_test_bin").stdout_utf8();

diff()
.expected_file("output.txt")
.actual_text("actual", out_driver)
.normalize(r#"\r"#, "")
.run();
diff().expected_file("output.txt").actual_text("actual", out_raw).run();
}
24 changes: 0 additions & 24 deletions tests/run-make/redundant-libs/Makefile

This file was deleted.

28 changes: 28 additions & 0 deletions tests/run-make/redundant-libs/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// rustc will remove one of the two redundant references to foo below. Depending
// on which one gets removed, we'll get a linker error on SOME platforms (like
// Linux). On these platforms, when a library is referenced, the linker will
// only pull in the symbols needed _at that point in time_. If a later library
// depends on additional symbols from the library, they will not have been pulled
// in, and you'll get undefined symbols errors.
//
// So in this example, we need to ensure that rustc keeps the _later_ reference
// to foo, and not the former one.

//@ ignore-cross-compile
// Reason: the compiled binary is executed

//FIXME(Oneirical): msvc

use run_make_support::{build_native_dynamic_lib, build_native_static_lib, run, rustc};

fn main() {
build_native_dynamic_lib("foo");
build_native_static_lib("bar");
build_native_static_lib("baz");
rustc()
.input("main.rs")
.args(&["-lstatic=bar", "-lfoo", "-lstatic=baz", "-lfoo"])
.print("link-args")
.run();
run("main");
}

0 comments on commit ef5357b

Please sign in to comment.