Skip to content

Commit 5e89830

Browse files
authored
Rollup merge of rust-lang#39993 - japaric:incr-san, r=alexcrichton
incr-comp: track the -Z sanitizer flag closes rust-lang#39611 r? @michaelwoerister
2 parents 045970f + 0b06db5 commit 5e89830

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/librustc/session/config.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub struct Config {
5151
pub uint_type: UintTy,
5252
}
5353

54-
#[derive(Clone)]
54+
#[derive(Clone, Hash)]
5555
pub enum Sanitizer {
5656
Address,
5757
Leak,
@@ -970,7 +970,7 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
970970
"encode MIR of all functions into the crate metadata"),
971971
osx_rpath_install_name: bool = (false, parse_bool, [TRACKED],
972972
"pass `-install_name @rpath/...` to the OSX linker"),
973-
sanitizer: Option<Sanitizer> = (None, parse_sanitizer, [UNTRACKED],
973+
sanitizer: Option<Sanitizer> = (None, parse_sanitizer, [TRACKED],
974974
"Use a sanitizer"),
975975
}
976976

@@ -1728,7 +1728,7 @@ mod dep_tracking {
17281728
use std::path::PathBuf;
17291729
use std::collections::hash_map::DefaultHasher;
17301730
use super::{Passes, CrateType, OptLevel, DebugInfoLevel,
1731-
OutputTypes, Externs, ErrorOutputType};
1731+
OutputTypes, Externs, ErrorOutputType, Sanitizer};
17321732
use syntax::feature_gate::UnstableFeatures;
17331733
use rustc_back::PanicStrategy;
17341734

@@ -1781,6 +1781,8 @@ mod dep_tracking {
17811781
impl_dep_tracking_hash_via_hash!(Externs);
17821782
impl_dep_tracking_hash_via_hash!(OutputTypes);
17831783
impl_dep_tracking_hash_via_hash!(cstore::NativeLibraryKind);
1784+
impl_dep_tracking_hash_via_hash!(Sanitizer);
1785+
impl_dep_tracking_hash_via_hash!(Option<Sanitizer>);
17841786

17851787
impl_dep_tracking_hash_for_sortable_vec_of!(String);
17861788
impl_dep_tracking_hash_for_sortable_vec_of!(CrateType);

0 commit comments

Comments
 (0)