diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-06-19 19:42:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 19:42:55 -0700 |
| commit | 17b80d947dccb7d73efbffd8fe6e8ae28af759ee (patch) | |
| tree | 652ff7e09b1e54ce928ee1911a658b6bbd3247cd /src/librustc_codegen_llvm/llvm | |
| parent | 2d1bd57e60a141fc2a460539b69e228cc1d7010e (diff) | |
| parent | 0a65f280c8eac844a74b758822ca52e8763a1d5d (diff) | |
Rollup merge of #73347 - tmiasko:incompatible-sanitizers, r=nikic
Diagnose use of incompatible sanitizers Emit an error when incompatible sanitizer are configured through command line options. Previously the last one configured prevailed and others were silently ignored. Additionally use a set to represent configured sanitizers, making it possible to enable multiple sanitizers at once. At least in principle, since currently all of them are considered to be incompatible with others.
Diffstat (limited to 'src/librustc_codegen_llvm/llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/llvm/ffi.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/src/librustc_codegen_llvm/llvm/ffi.rs index 372fb17573a..8063d97aa73 100644 --- a/src/librustc_codegen_llvm/llvm/ffi.rs +++ b/src/librustc_codegen_llvm/llvm/ffi.rs @@ -439,11 +439,12 @@ pub enum OptStage { /// LLVMRustSanitizerOptions #[repr(C)] pub struct SanitizerOptions { - pub sanitize_memory: bool, - pub sanitize_thread: bool, pub sanitize_address: bool, - pub sanitize_recover: bool, + pub sanitize_address_recover: bool, + pub sanitize_memory: bool, + pub sanitize_memory_recover: bool, pub sanitize_memory_track_origins: c_int, + pub sanitize_thread: bool, } /// LLVMRelocMode |