nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-18 18:04:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark __msan_keep_going as an exported symbol for LTO

Browse Source
This commit is contained in:
Tomasz Miąsko 2020-01-21 00:00:00 +00:00
parent 2c0845c6cc
commit d8c661a886
2 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_codegen_ssa/back/symbol_export.rs
View File

@ -208,8 +208,12 @@ fn exported_symbols_provider_local(
if let Some(Sanitizer::Memory) = tcx.sess.opts.debugging_opts.sanitizer {
// Similar to profiling, preserve weak msan symbol during LTO.
let exported_symbol = ExportedSymbol::NoDefId(SymbolName::new("__msan_track_origins"));
symbols.push((exported_symbol, SymbolExportLevel::C));
const MSAN_WEAK_SYMBOLS: [&str; 2] = ["__msan_track_origins", "__msan_keep_going"];
symbols.extend(MSAN_WEAK_SYMBOLS.iter().map(|sym| {
let exported_symbol = ExportedSymbol::NoDefId(SymbolName::new(sym));
(exported_symbol, SymbolExportLevel::C)
}));
}
if tcx.sess.crate_types.borrow().contains(&config::CrateType::Dylib) {

56
src/test/codegen/sanitizer-recover.rs
View File

@ -4,31 +4,47 @@
// needs-sanitizer-support
// only-linux
// only-x86_64
// revisions:ASAN ASAN-RECOVER MSAN MSAN-RECOVER
// revisions:ASAN ASAN-RECOVER MSAN MSAN-RECOVER MSAN-RECOVER-LTO
// no-prefer-dynamic
//
//[ASAN] compile-flags: -Zsanitizer=address
//[ASAN-RECOVER] compile-flags: -Zsanitizer=address -Zsanitizer-recover=address
//[MSAN] compile-flags: -Zsanitizer=memory
//[MSAN-RECOVER] compile-flags: -Zsanitizer=memory -Zsanitizer-recover=memory
//[ASAN] compile-flags: -Zsanitizer=address
//[ASAN-RECOVER] compile-flags: -Zsanitizer=address -Zsanitizer-recover=address
//[MSAN] compile-flags: -Zsanitizer=memory
//[MSAN-RECOVER] compile-flags: -Zsanitizer=memory -Zsanitizer-recover=memory
//[MSAN-RECOVER-LTO] compile-flags: -Zsanitizer=memory -Zsanitizer-recover=memory -C lto=fat
//
// MSAN-NOT: @__msan_keep_going
// MSAN-RECOVER: @__msan_keep_going = weak_odr {{.*}} constant i32 1
// MSAN-RECOVER-LTO: @__msan_keep_going = weak_odr {{.*}} constant i32 1
#![crate_type="lib"]
// ASAN-LABEL: define i32 @penguin(
// ASAN-LABEL: define i32 @penguin(
// ASAN: call void @__asan_report_load4(i64 %0)
// ASAN: unreachable
// ASAN: }
//
// ASAN-RECOVER-LABEL: define i32 @penguin(
// MSAN-LABEL: define i32 @penguin(
// ASAN-RECOVER: call void @__asan_report_load4_noabort(
// ASAN-RECOVER-NOT: unreachable
// ASAN: }
//
// MSAN-LABEL: define i32 @penguin(
// MSAN: call void @__msan_warning_noreturn()
// MSAN: unreachable
// MSAN: }
//
// MSAN-RECOVER-LABEL: define i32 @penguin(
// MSAN-RECOVER: call void @__msan_warning()
// MSAN-RECOVER-NOT: unreachable
// MSAN-RECOVER: }
//
// MSAN-RECOVER-LTO-LABEL: define i32 @penguin(
// MSAN-RECOVER-LTO: call void @__msan_warning()
// MSAN-RECOVER-LTO-NOT: unreachable
// MSAN-RECOVER-LTO: }
//
#[no_mangle]
pub fn penguin(p: &mut i32) -> i32 {
// ASAN: call void @__asan_report_load4(i64 %0)
// ASAN: unreachable
//
// ASAN-RECOVER: call void @__asan_report_load4_noabort(
// ASAN-RECOVER-NOT: unreachable
//
// MSAN: call void @__msan_warning_noreturn()
// MSAN: unreachable
//
// MSAN-RECOVER: call void @__msan_warning()
// MSAN-RECOVER-NOT: unreachable
*p
}
fn main() {}