bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Create sanitizer passes in a separate function

Browse source
This commit is contained in:
Tomasz Miąsko 2019-11-19 00:00:00 +00:00
parent 5141aa36f6
commit bf121a33c4
1 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/librustc_codegen_llvm/back/write.rs
View file

@ -363,26 +363,7 @@ pub(crate) unsafe fn optimize(cgcx: &CodegenContext<LlvmCodegenBackend>,
} }
} }
if let Some(sanitizer) = &config.sanitizer { add_sanitizer_passes(config, &mut extra_passes);
let recover = config.sanitizer_recover.contains(sanitizer);
match sanitizer {
Sanitizer::Address => {
extra_passes.push(llvm::LLVMRustCreateAddressSanitizerFunctionPass(
recover));
extra_passes.push(llvm::LLVMRustCreateModuleAddressSanitizerPass(
recover));
}
Sanitizer::Memory => {
let track_origins = config.sanitizer_memory_track_origins as c_int;
extra_passes.push(llvm::LLVMRustCreateMemorySanitizerPass(
track_origins, recover));
}
Sanitizer::Thread => {
extra_passes.push(llvm::LLVMRustCreateThreadSanitizerPass());
}
_ => {}
}
}
for pass_name in &cgcx.plugin_passes { for pass_name in &cgcx.plugin_passes {
if let Some(pass) = find_pass(pass_name) { if let Some(pass) = find_pass(pass_name) {
@ -469,6 +450,31 @@ pub(crate) unsafe fn optimize(cgcx: &CodegenContext<LlvmCodegenBackend>,
Ok(()) Ok(())
} }
unsafe fn add_sanitizer_passes(config: &ModuleConfig,
passes: &mut Vec<&'static mut llvm::Pass>) {
let sanitizer = match &config.sanitizer {
None => return,
Some(s) => s,
};
let recover = config.sanitizer_recover.contains(sanitizer);
match sanitizer {
Sanitizer::Address => {
passes.push(llvm::LLVMRustCreateAddressSanitizerFunctionPass(recover));
passes.push(llvm::LLVMRustCreateModuleAddressSanitizerPass(recover));
}
Sanitizer::Memory => {
let track_origins = config.sanitizer_memory_track_origins as c_int;
passes.push(llvm::LLVMRustCreateMemorySanitizerPass(track_origins, recover));
}
Sanitizer::Thread => {
passes.push(llvm::LLVMRustCreateThreadSanitizerPass());
}
Sanitizer::Leak => {}
}
}
pub(crate) unsafe fn codegen(cgcx: &CodegenContext<LlvmCodegenBackend>, pub(crate) unsafe fn codegen(cgcx: &CodegenContext<LlvmCodegenBackend>,
diag_handler: &Handler, diag_handler: &Handler,
module: ModuleCodegen<ModuleLlvm>, module: ModuleCodegen<ModuleLlvm>,