| Sanitizer runtimes are currently behind the `-Z` flag, which is only available |
| on nightly builds of the compiler. We would like to enable fuzzing on chrome |
| os anyway so move the sanitizer option under `-C` instead since we don't build |
| the toolchain in nightly mode. |
| |
| diff --git a/src/librustc_codegen_llvm/attributes.rs b/src/librustc_codegen_llvm/attributes.rs |
| index ba286e5f40d..a665c27a1c5 100644 |
| --- a/src/librustc_codegen_llvm/attributes.rs |
| +++ b/src/librustc_codegen_llvm/attributes.rs |
| @@ -46,7 +46,7 @@ fn inline(cx: &CodegenCx<'ll, '_>, val: &'ll Value, inline: InlineAttr) { |
| /// Apply LLVM sanitize attributes. |
| #[inline] |
| pub fn sanitize(cx: &CodegenCx<'ll, '_>, codegen_fn_flags: CodegenFnAttrFlags, llfn: &'ll Value) { |
| - if let Some(ref sanitizer) = cx.tcx.sess.opts.debugging_opts.sanitizer { |
| + if let Some(ref sanitizer) = cx.tcx.sess.opts.cg.sanitizer { |
| match *sanitizer { |
| Sanitizer::Address => { |
| if !codegen_fn_flags.contains(CodegenFnAttrFlags::NO_SANITIZE_ADDRESS) { |
| @@ -123,7 +123,7 @@ fn set_probestack(cx: &CodegenCx<'ll, '_>, llfn: &'ll Value) { |
| // Currently stack probes seem somewhat incompatible with the address |
| // sanitizer and thread sanitizer. With asan we're already protected from |
| // stack overflow anyway so we don't really need stack probes regardless. |
| - match cx.sess().opts.debugging_opts.sanitizer { |
| + match cx.sess().opts.cg.sanitizer { |
| Some(Sanitizer::Address | Sanitizer::Thread) => return, |
| _ => {} |
| } |
| diff --git a/src/librustc_codegen_llvm/builder.rs b/src/librustc_codegen_llvm/builder.rs |
| index 89bd96c1fe2..c4dd022f533 100644 |
| --- a/src/librustc_codegen_llvm/builder.rs |
| +++ b/src/librustc_codegen_llvm/builder.rs |
| @@ -1244,7 +1244,7 @@ impl Builder<'a, 'll, 'tcx> { |
| } |
| |
| let opts = &self.cx.sess().opts; |
| - let emit = match opts.debugging_opts.sanitizer { |
| + let emit = match opts.cg.sanitizer { |
| // Some sanitizer use lifetime intrinsics. When they are in use, |
| // emit lifetime intrinsics regardless of optimization level. |
| Some(Sanitizer::Address | Sanitizer::Memory) => true, |
| diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs |
| index 8725bfaa025..3a27b860d94 100644 |
| --- a/src/librustc_codegen_ssa/back/link.rs |
| +++ b/src/librustc_codegen_ssa/back/link.rs |
| @@ -681,7 +681,7 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>( |
| } |
| |
| fn link_sanitizer_runtime(sess: &Session, crate_type: config::CrateType, linker: &mut dyn Linker) { |
| - let sanitizer = match &sess.opts.debugging_opts.sanitizer { |
| + let sanitizer = match &sess.opts.cg.sanitizer { |
| Some(s) => s, |
| None => return, |
| }; |
| @@ -715,7 +715,11 @@ fn link_sanitizer_runtime(sess: &Session, crate_type: config::CrateType, linker: |
| linker.args(&["-Wl,-rpath", "-Xlinker", rpath]); |
| linker.link_dylib(Symbol::intern(&libname)); |
| } |
| - "x86_64-unknown-linux-gnu" | "x86_64-fuchsia" | "aarch64-fuchsia" => { |
| + "x86_64-unknown-linux-gnu" |
| + | "x86_64-fuchsia" |
| + | "aarch64-fuchsia" |
| + | "x86_64-cros-linux-gnu" |
| + | "x86_64-pc-linux-gnu" => { |
| let filename = format!("librustc{}_rt.{}.a", channel, name); |
| let path = default_tlib.join(&filename); |
| linker.link_whole_rlib(&path); |
| @@ -1440,7 +1444,7 @@ fn linker_with_args<'a, B: ArchiveBuilder<'a>>( |
| |
| // NO-OPT-OUT, OBJECT-FILES-NO, AUDIT-ORDER |
| if sess.target.target.options.is_like_fuchsia { |
| - let prefix = match sess.opts.debugging_opts.sanitizer { |
| + let prefix = match sess.opts.cg.sanitizer { |
| Some(Sanitizer::Address) => "asan/", |
| _ => "", |
| }; |
| diff --git a/src/librustc_codegen_ssa/back/symbol_export.rs b/src/librustc_codegen_ssa/back/symbol_export.rs |
| index d5489ff9505..339dabfa008 100644 |
| --- a/src/librustc_codegen_ssa/back/symbol_export.rs |
| +++ b/src/librustc_codegen_ssa/back/symbol_export.rs |
| @@ -206,7 +206,7 @@ fn exported_symbols_provider_local( |
| })); |
| } |
| |
| - if let Some(Sanitizer::Memory) = tcx.sess.opts.debugging_opts.sanitizer { |
| + if let Some(Sanitizer::Memory) = tcx.sess.opts.cg.sanitizer { |
| // Similar to profiling, preserve weak msan symbol during LTO. |
| const MSAN_WEAK_SYMBOLS: [&str; 2] = ["__msan_track_origins", "__msan_keep_going"]; |
| |
| diff --git a/src/librustc_codegen_ssa/back/write.rs b/src/librustc_codegen_ssa/back/write.rs |
| index d81a767abd4..695f1eac99a 100644 |
| --- a/src/librustc_codegen_ssa/back/write.rs |
| +++ b/src/librustc_codegen_ssa/back/write.rs |
| @@ -177,7 +177,7 @@ impl ModuleConfig { |
| ), |
| pgo_use: if_regular!(sess.opts.cg.profile_use.clone(), None), |
| |
| - sanitizer: if_regular!(sess.opts.debugging_opts.sanitizer.clone(), None), |
| + sanitizer: if_regular!(sess.opts.cg.sanitizer.clone(), None), |
| sanitizer_recover: if_regular!( |
| sess.opts.debugging_opts.sanitizer_recover.clone(), |
| vec![] |
| diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs |
| index 173c2a3f1d8..aa08ea6d94f 100644 |
| --- a/src/librustc_mir/transform/inline.rs |
| +++ b/src/librustc_mir/transform/inline.rs |
| @@ -221,7 +221,7 @@ impl Inliner<'tcx> { |
| |
| // Avoid inlining functions marked as no_sanitize if sanitizer is enabled, |
| // since instrumentation might be enabled and performed on the caller. |
| - match self.tcx.sess.opts.debugging_opts.sanitizer { |
| + match self.tcx.sess.opts.cg.sanitizer { |
| Some(Sanitizer::Address) => { |
| if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::NO_SANITIZE_ADDRESS) { |
| return false; |
| diff --git a/src/librustc_session/config.rs b/src/librustc_session/config.rs |
| index 2513cfa73e5..a50768c04c5 100644 |
| --- a/src/librustc_session/config.rs |
| +++ b/src/librustc_session/config.rs |
| @@ -713,7 +713,7 @@ pub fn default_configuration(sess: &Session) -> CrateConfig { |
| } |
| } |
| } |
| - if let Some(s) = &sess.opts.debugging_opts.sanitizer { |
| + if let Some(s) = &sess.opts.cg.sanitizer { |
| let symbol = Symbol::intern(&s.to_string()); |
| ret.insert((sym::sanitize, Some(symbol))); |
| } |
| diff --git a/src/librustc_session/options.rs b/src/librustc_session/options.rs |
| index 5e17fc98985..a6bfd9b3e83 100644 |
| --- a/src/librustc_session/options.rs |
| +++ b/src/librustc_session/options.rs |
| @@ -695,6 +695,8 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options, |
| "allow the linker to link its default libraries (default: no)"), |
| linker_flavor: Option<LinkerFlavor> = (None, parse_linker_flavor, [UNTRACKED], |
| "linker flavor"), |
| + sanitizer: Option<Sanitizer> = (None, parse_sanitizer, [TRACKED], |
| + "use a sanitizer"), |
| linker_plugin_lto: LinkerPluginLto = (LinkerPluginLto::Disabled, |
| parse_linker_plugin_lto, [TRACKED], |
| "generate build artifacts that are compatible with linker-based LTO"), |
| @@ -854,8 +856,6 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options, |
| "take the brakes off const evaluation. NOTE: this is unsound (default: no)"), |
| osx_rpath_install_name: bool = (false, parse_bool, [TRACKED], |
| "pass `-install_name @rpath/...` to the macOS linker (default: no)"), |
| - sanitizer: Option<Sanitizer> = (None, parse_sanitizer, [TRACKED], |
| - "use a sanitizer"), |
| sanitizer_recover: Vec<Sanitizer> = (vec![], parse_sanitizer_list, [TRACKED], |
| "enable recovery for selected sanitizers"), |
| sanitizer_memory_track_origins: usize = (0, parse_sanitizer_memory_track_origins, [TRACKED], |
| diff --git a/src/librustc_session/session.rs b/src/librustc_session/session.rs |
| index f0bbe1d0a18..e3085e834e1 100644 |
| --- a/src/librustc_session/session.rs |
| +++ b/src/librustc_session/session.rs |
| @@ -531,7 +531,7 @@ impl Session { |
| || self.opts.output_types.contains_key(&OutputType::Bitcode); |
| |
| // Address sanitizer and memory sanitizer use alloca name when reporting an issue. |
| - let more_names = match self.opts.debugging_opts.sanitizer { |
| + let more_names = match self.opts.cg.sanitizer { |
| Some(Sanitizer::Address) => true, |
| Some(Sanitizer::Memory) => true, |
| _ => more_names, |
| @@ -1193,18 +1193,32 @@ fn validate_commandline_args_with_session_available(sess: &Session) { |
| } |
| |
| // Sanitizers can only be used on some tested platforms. |
| - if let Some(ref sanitizer) = sess.opts.debugging_opts.sanitizer { |
| + if let Some(ref sanitizer) = sess.opts.cg.sanitizer { |
| const ASAN_SUPPORTED_TARGETS: &[&str] = &[ |
| "x86_64-unknown-linux-gnu", |
| + "x86_64-cros-linux-gnu", |
| + "x86_64-pc-linux-gnu", |
| "x86_64-apple-darwin", |
| "x86_64-fuchsia", |
| "aarch64-fuchsia", |
| ]; |
| - const TSAN_SUPPORTED_TARGETS: &[&str] = |
| - &["x86_64-unknown-linux-gnu", "x86_64-apple-darwin"]; |
| - const LSAN_SUPPORTED_TARGETS: &[&str] = |
| - &["x86_64-unknown-linux-gnu", "x86_64-apple-darwin"]; |
| - const MSAN_SUPPORTED_TARGETS: &[&str] = &["x86_64-unknown-linux-gnu"]; |
| + const TSAN_SUPPORTED_TARGETS: &[&str] = &[ |
| + "x86_64-unknown-linux-gnu", |
| + "x86_64-cros-linux-gnu", |
| + "x86_64-pc-linux-gnu", |
| + "x86_64-apple-darwin", |
| + ]; |
| + const LSAN_SUPPORTED_TARGETS: &[&str] = &[ |
| + "x86_64-unknown-linux-gnu", |
| + "x86_64-cros-linux-gnu", |
| + "x86_64-pc-linux-gnu", |
| + "x86_64-apple-darwin", |
| + ]; |
| + const MSAN_SUPPORTED_TARGETS: &[&str] = &[ |
| + "x86_64-unknown-linux-gnu", |
| + "x86_64-cros-linux-gnu", |
| + "x86_64-pc-linux-gnu", |
| + ]; |
| |
| let supported_targets = match *sanitizer { |
| Sanitizer::Address => ASAN_SUPPORTED_TARGETS, |
