mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split a complex conditional into separate statements

Browse Source
This commit is contained in:
Chris Wailes 2024-03-13 11:13:25 -07:00
parent 2a9d1ed538
commit bf2858a05f
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
compiler/rustc_codegen_ssa/src/back/link.rs
View File

@ -1201,21 +1201,29 @@ fn add_sanitizer_libraries(
crate_type: CrateType, crate_type: CrateType,
linker: &mut dyn Linker, linker: &mut dyn Linker,
) { ) {
// On macOS and Windows using MSVC the runtimes are distributed as dylibs if sess.target.is_like_android {
// which should be linked to both executables and dynamic libraries. // Sanitizer runtime libraries are provided dynamically on Android
// Everywhere else the runtimes are currently distributed as static // targets.
// libraries which should be linked to executables only. return;
let needs_runtime = !sess.target.is_like_android }
&& !sess.opts.unstable_opts.external_clangrt
&& match crate_type {
CrateType::Executable => true,
CrateType::Dylib | CrateType::Cdylib | CrateType::ProcMacro => {
sess.target.is_like_osx || sess.target.is_like_msvc
}
CrateType::Rlib | CrateType::Staticlib => false,
};
if !needs_runtime { if sess.opts.unstable_opts.external_clangrt {
// Linking against in-tree sanitizer runtimes is disabled via
// `-Z external-clangrt`
return;
}
// On macOS the runtimes are distributed as dylibs which should be linked to
// both executables and dynamic shared objects. On most other platforms the
// runtimes are currently distributed as static libraries which should be
// linked to executables only.
if matches!(crate_type, CrateType::Rlib | CrateType::Staticlib) {
return;
}
if matches!(crate_type, CrateType::Dylib | CrateType::Cdylib | CrateType::ProcMacro)
&& (sess.target.is_like_osx || sess.target.is_like_msvc)
{
return; return;
} }