Skip to content

Commit 3c1d9ad

Browse files
borsbors
committedMar 25, 2020
Auto merge of #70297 - nnethercote:clean-up-debugging-options, r=michaelwoerister
Clean up debugging options I found various sub-optimal things when I was looking at option handling.
·
1.87.01.44.0
2 parents cdb50c6 + 46c8a2c commit 3c1d9ad

21 files changed

+40
-86
lines changed
 

‎src/librustc/ty/query/plumbing.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -615,9 +615,7 @@ impl<'tcx> TyCtxt<'tcx> {
615615
debug_assert!(self.dep_graph.is_green(dep_node));
616616

617617
// First we try to load the result from the on-disk cache.
618-
let result = if Q::cache_on_disk(self, key.clone(), None)
619-
&& self.sess.opts.debugging_opts.incremental_queries
620-
{
618+
let result = if Q::cache_on_disk(self, key.clone(), None) {
621619
let prof_timer = self.prof.incr_cache_loading();
622620
let result = Q::try_load_from_disk(self, prev_dep_node_index);
623621
prof_timer.finish_with_query_invocation_id(dep_node_index.into());

‎src/librustc_codegen_llvm/llvm_util.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ unsafe fn configure_llvm(sess: &Session) {
8080
if sess.print_llvm_passes() {
8181
add("-debug-pass=Structure", false);
8282
}
83-
84-
if sess.opts.debugging_opts.generate_arange_section {
83+
if !sess.opts.debugging_opts.no_generate_arange_section {
8584
add("-generate-arange-section", false);
8685
}
8786
if get_major_version() >= 8 {

‎src/librustc_incremental/persist/load.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ pub fn load_dep_graph(sess: &Session) -> DepGraphFuture {
195195
}
196196

197197
pub fn load_query_result_cache(sess: &Session) -> OnDiskCache<'_> {
198-
if sess.opts.incremental.is_none() || !sess.opts.debugging_opts.incremental_queries {
198+
if sess.opts.incremental.is_none() {
199199
return OnDiskCache::new_empty(sess.source_map());
200200
}
201201

‎src/librustc_incremental/persist/save.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ pub fn save_dep_graph(tcx: TyCtxt<'_>) {
3131

3232
join(
3333
move || {
34-
if tcx.sess.opts.debugging_opts.incremental_queries {
35-
sess.time("incr_comp_persist_result_cache", || {
36-
save_in(sess, query_cache_path, |e| encode_query_cache(tcx, e));
37-
});
38-
}
34+
sess.time("incr_comp_persist_result_cache", || {
35+
save_in(sess, query_cache_path, |e| encode_query_cache(tcx, e));
36+
});
3937
},
4038
|| {
4139
sess.time("incr_comp_persist_dep_graph", || {

‎src/librustc_interface/tests.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -546,8 +546,6 @@ fn test_debugging_options_tracking_hash() {
546546
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
547547
opts.debugging_opts.parse_only = true;
548548
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
549-
opts.debugging_opts.incremental = Some(String::from("abc"));
550-
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
551549
opts.debugging_opts.dump_dep_graph = true;
552550
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
553551
opts.debugging_opts.query_dep_graph = true;
@@ -560,8 +558,6 @@ fn test_debugging_options_tracking_hash() {
560558
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
561559
opts.debugging_opts.keep_hygiene_data = true;
562560
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
563-
opts.debugging_opts.keep_ast = true;
564-
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
565561
opts.debugging_opts.print_mono_items = Some(String::from("abc"));
566562
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
567563
opts.debugging_opts.dump_mir = Some(String::from("abc"));

‎src/librustc_session/config.rs

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,33 +1286,6 @@ fn check_thread_count(debugging_opts: &DebuggingOptions, error_format: ErrorOutp
12861286
}
12871287
}
12881288

1289-
fn select_incremental_path(
1290-
debugging_opts: &DebuggingOptions,
1291-
cg: &CodegenOptions,
1292-
error_format: ErrorOutputType,
1293-
) -> Option<PathBuf> {
1294-
match (&debugging_opts.incremental, &cg.incremental) {
1295-
(Some(path1), Some(path2)) => {
1296-
if path1 != path2 {
1297-
early_error(
1298-
error_format,
1299-
&format!(
1300-
"conflicting paths for `-Z incremental` and \
1301-
`-C incremental` specified: {} versus {}",
1302-
path1, path2
1303-
),
1304-
);
1305-
} else {
1306-
Some(path1)
1307-
}
1308-
}
1309-
(Some(path), None) => Some(path),
1310-
(None, Some(path)) => Some(path),
1311-
(None, None) => None,
1312-
}
1313-
.map(PathBuf::from)
1314-
}
1315-
13161289
fn collect_print_requests(
13171290
cg: &mut CodegenOptions,
13181291
dopts: &mut DebuggingOptions,
@@ -1677,7 +1650,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
16771650

16781651
check_thread_count(&debugging_opts, error_format);
16791652

1680-
let incremental = select_incremental_path(&debugging_opts, &cg, error_format);
1653+
let incremental = cg.incremental.as_ref().map(|m| PathBuf::from(m));
16811654

16821655
if debugging_opts.profile && incremental.is_some() {
16831656
early_error(

‎src/librustc_session/options.rs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,9 @@ macro_rules! options {
299299
}
300300
)*
301301

302+
/// Set a flag to true. Note that it cannot set the flag to false, so
303+
/// using this parser in combination with a flag that defaults to true
304+
/// is useless; the flag will always be true.
302305
fn parse_bool(slot: &mut bool, v: Option<&str>) -> bool {
303306
match v {
304307
Some(..) => false,
@@ -786,14 +789,8 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
786789
"support compiling tests with panic=abort"),
787790
dep_tasks: bool = (false, parse_bool, [UNTRACKED],
788791
"print tasks that execute and the color their dep node gets (requires debug build)"),
789-
incremental: Option<String> = (None, parse_opt_string, [UNTRACKED],
790-
"enable incremental compilation (experimental)"),
791-
incremental_queries: bool = (true, parse_bool, [UNTRACKED],
792-
"enable incremental compilation support for queries (experimental)"),
793792
incremental_info: bool = (false, parse_bool, [UNTRACKED],
794793
"print high-level information about incremental reuse (or the lack thereof)"),
795-
incremental_dump_hash: bool = (false, parse_bool, [UNTRACKED],
796-
"dump hash information in textual format to stdout"),
797794
incremental_verify_ich: bool = (false, parse_bool, [UNTRACKED],
798795
"verify incr. comp. hashes of green query instances"),
799796
incremental_ignore_spans: bool = (false, parse_bool, [UNTRACKED],
@@ -814,12 +811,10 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
814811
"for every macro invocation, print its name and arguments"),
815812
debug_macros: bool = (false, parse_bool, [TRACKED],
816813
"emit line numbers debug info inside macros"),
817-
generate_arange_section: bool = (true, parse_bool, [TRACKED],
818-
"generate DWARF address ranges for faster lookups"),
814+
no_generate_arange_section: bool = (false, parse_bool, [TRACKED],
815+
"don't generate DWARF address ranges that give faster lookups"),
819816
keep_hygiene_data: bool = (false, parse_bool, [UNTRACKED],
820817
"don't clear the hygiene data after analysis"),
821-
keep_ast: bool = (false, parse_bool, [UNTRACKED],
822-
"keep the AST after lowering it to HIR"),
823818
show_span: Option<String> = (None, parse_opt_string, [TRACKED],
824819
"show spans for compiler debugging (expr|pat|ty)"),
825820
print_type_sizes: bool = (false, parse_bool, [UNTRACKED],
@@ -854,8 +849,6 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
854849
"print some statistics about AST and HIR"),
855850
always_encode_mir: bool = (false, parse_bool, [TRACKED],
856851
"encode MIR of all functions into the crate metadata"),
857-
json_rendered: Option<String> = (None, parse_opt_string, [UNTRACKED],
858-
"describes how to render the `rendered` field of json diagnostics"),
859852
unleash_the_miri_inside_of_you: bool = (false, parse_bool, [TRACKED],
860853
"take the breaks off const evaluation. NOTE: this is unsound"),
861854
osx_rpath_install_name: bool = (false, parse_bool, [TRACKED],
@@ -886,8 +879,6 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
886879
"emit diagnostics rather than buffering (breaks NLL error downgrading, sorting)."),
887880
polonius: bool = (false, parse_bool, [UNTRACKED],
888881
"enable polonius-based borrow-checker"),
889-
codegen_time_graph: bool = (false, parse_bool, [UNTRACKED],
890-
"generate a graphical HTML report of time spent in codegen and LLVM"),
891882
thinlto: Option<bool> = (None, parse_opt_bool, [TRACKED],
892883
"enable ThinLTO when possible"),
893884
inline_in_all_cgus: Option<bool> = (None, parse_opt_bool, [TRACKED],

‎src/test/codegen-units/partitioning/extern-drop-glue.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// ignore-tidy-linelength
22

3-
// We specify -Z incremental here because we want to test the partitioning for
3+
// We specify -C incremental here because we want to test the partitioning for
44
// incremental compilation
55
// We specify opt-level=0 because `drop_in_place` is `Internal` when optimizing
6-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/extern-drop-glue
6+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/extern-drop-glue
77
// compile-flags:-Zinline-in-all-cgus -Copt-level=0
88

99
#![allow(dead_code)]

‎src/test/codegen-units/partitioning/extern-generic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=eager -Zincremental=tmp/partitioning-tests/extern-generic -Zshare-generics=y
4+
// compile-flags:-Zprint-mono-items=eager -Cincremental=tmp/partitioning-tests/extern-generic -Zshare-generics=y
55

66
#![allow(dead_code)]
77
#![crate_type="lib"]

‎src/test/codegen-units/partitioning/inlining-from-extern-crate.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/inlining-from-extern-crate
4+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/inlining-from-extern-crate
55
// compile-flags:-Zinline-in-all-cgus
66

77
#![crate_type="lib"]

‎src/test/codegen-units/partitioning/local-drop-glue.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
44
// We specify opt-level=0 because `drop_in_place` is `Internal` when optimizing
5-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/local-drop-glue
5+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/local-drop-glue
66
// compile-flags:-Zinline-in-all-cgus -Copt-level=0
77

88
#![allow(dead_code)]

‎src/test/codegen-units/partitioning/local-generic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=eager -Zincremental=tmp/partitioning-tests/local-generic
4+
// compile-flags:-Zprint-mono-items=eager -Cincremental=tmp/partitioning-tests/local-generic
55

66
#![allow(dead_code)]
77
#![crate_type="lib"]

‎src/test/codegen-units/partitioning/local-inlining-but-not-all.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/local-inlining-but-not-all
4+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/local-inlining-but-not-all
55
// compile-flags:-Zinline-in-all-cgus=no
66

77
#![allow(dead_code)]

‎src/test/codegen-units/partitioning/local-inlining.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/local-inlining
4+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/local-inlining
55
// compile-flags:-Zinline-in-all-cgus
66

77
#![allow(dead_code)]

‎src/test/codegen-units/partitioning/local-transitive-inlining.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/local-transitive-inlining
4+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/local-transitive-inlining
55
// compile-flags:-Zinline-in-all-cgus
66

77
#![allow(dead_code)]

‎src/test/codegen-units/partitioning/methods-are-with-self-type.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
// ignore-test
55

66
// ignore-tidy-linelength
7-
// We specify -Z incremental here because we want to test the partitioning for
7+
// We specify -C incremental here because we want to test the partitioning for
88
// incremental compilation
9-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/methods-are-with-self-type
9+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/methods-are-with-self-type
1010

1111
#![allow(dead_code)]
1212
#![feature(start)]

‎src/test/codegen-units/partitioning/regular-modules.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=eager -Zincremental=tmp/partitioning-tests/regular-modules
4+
// compile-flags:-Zprint-mono-items=eager -Cincremental=tmp/partitioning-tests/regular-modules
55

66
#![allow(dead_code)]
77
#![crate_type="lib"]

‎src/test/codegen-units/partitioning/shared-generics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// no-prefer-dynamic
33
// NOTE: We always compile this test with -Copt-level=0 because higher opt-levels
44
// prevent drop-glue from participating in share-generics.
5-
// compile-flags:-Zprint-mono-items=eager -Zshare-generics=yes -Zincremental=tmp/partitioning-tests/shared-generics-exe -Copt-level=0
5+
// compile-flags:-Zprint-mono-items=eager -Zshare-generics=yes -Cincremental=tmp/partitioning-tests/shared-generics-exe -Copt-level=0
66

77
#![crate_type="rlib"]
88

‎src/test/codegen-units/partitioning/statics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// We specify -Z incremental here because we want to test the partitioning for
1+
// We specify -C incremental here because we want to test the partitioning for
22
// incremental compilation
3-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/statics
3+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/statics
44

55
#![crate_type="rlib"]
66

‎src/test/codegen-units/partitioning/vtable-through-const.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// ignore-tidy-linelength
22

3-
// We specify -Z incremental here because we want to test the partitioning for
3+
// We specify -C incremental here because we want to test the partitioning for
44
// incremental compilation
5-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/vtable-through-const
5+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/vtable-through-const
66
// compile-flags:-Zinline-in-all-cgus
77

88
// This test case makes sure, that references made through constants are

‎src/tools/compiletest/src/runtest.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,7 +1852,6 @@ impl<'test> TestCx<'test> {
18521852
if let Some(ref incremental_dir) = self.props.incremental_dir {
18531853
rustc.args(&["-C", &format!("incremental={}", incremental_dir.display())]);
18541854
rustc.args(&["-Z", "incremental-verify-ich"]);
1855-
rustc.args(&["-Z", "incremental-queries"]);
18561855
}
18571856

18581857
if self.config.mode == CodegenUnits {
@@ -2571,12 +2570,12 @@ impl<'test> TestCx<'test> {
25712570
// - if `cfail`, expect compilation to fail
25722571
// - if `rfail`, expect execution to fail
25732572
// - create a directory build/foo/bar.incremental
2574-
// - compile foo/bar.rs with -Z incremental=.../foo/bar.incremental and -C rpass1
2573+
// - compile foo/bar.rs with -C incremental=.../foo/bar.incremental and -C rpass1
25752574
// - because name of revision starts with "rpass", expect success
2576-
// - compile foo/bar.rs with -Z incremental=.../foo/bar.incremental and -C cfail2
2575+
// - compile foo/bar.rs with -C incremental=.../foo/bar.incremental and -C cfail2
25772576
// - because name of revision starts with "cfail", expect an error
25782577
// - load expected errors as usual, but filter for those that end in `[rfail2]`
2579-
// - compile foo/bar.rs with -Z incremental=.../foo/bar.incremental and -C rpass3
2578+
// - compile foo/bar.rs with -C incremental=.../foo/bar.incremental and -C rpass3
25802579
// - because name of revision starts with "rpass", expect success
25812580
// - execute build/foo/bar.exe and save output
25822581
//

0 commit comments

Comments
 (0)
Please sign in to comment.