Adding upstream version 1.68.2+dfsg1.upstream/1.68.2+dfsg1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

193 files changed, 144 insertions, 83 deletions

diff --git a/src/test/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs b/tests/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs
index 16aaad348..16aaad348 100644
--- a/src/test/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs
+++ b/tests/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs
diff --git a/src/test/incremental/add_private_fn_at_krate_root_cc/struct_point.rs b/tests/incremental/add_private_fn_at_krate_root_cc/struct_point.rs
index ea1ea1943..ea1ea1943 100644
--- a/src/test/incremental/add_private_fn_at_krate_root_cc/struct_point.rs
+++ b/tests/incremental/add_private_fn_at_krate_root_cc/struct_point.rs
diff --git a/src/test/incremental/async-lifetimes.rs b/tests/incremental/async-lifetimes.rs
index 90a0b93b9..90a0b93b9 100644
--- a/src/test/incremental/async-lifetimes.rs
+++ b/tests/incremental/async-lifetimes.rs
diff --git a/src/test/incremental/auxiliary/incremental_proc_macro_aux.rs b/tests/incremental/auxiliary/incremental_proc_macro_aux.rs
index 6961450b4..6961450b4 100644
--- a/src/test/incremental/auxiliary/incremental_proc_macro_aux.rs
+++ b/tests/incremental/auxiliary/incremental_proc_macro_aux.rs
diff --git a/src/test/incremental/auxiliary/issue-49482-macro-def.rs b/tests/incremental/auxiliary/issue-49482-macro-def.rs
index bfa7abb1a..bfa7abb1a 100644
--- a/src/test/incremental/auxiliary/issue-49482-macro-def.rs
+++ b/tests/incremental/auxiliary/issue-49482-macro-def.rs
diff --git a/src/test/incremental/auxiliary/issue-49482-reexport.rs b/tests/incremental/auxiliary/issue-49482-reexport.rs
index 39f19e3f1..39f19e3f1 100644
--- a/src/test/incremental/auxiliary/issue-49482-reexport.rs
+++ b/tests/incremental/auxiliary/issue-49482-reexport.rs
diff --git a/src/test/incremental/auxiliary/issue-54059.rs b/tests/incremental/auxiliary/issue-54059.rs
index fa2814a77..fa2814a77 100644
--- a/src/test/incremental/auxiliary/issue-54059.rs
+++ b/tests/incremental/auxiliary/issue-54059.rs
diff --git a/src/test/incremental/auxiliary/issue-79661.rs b/tests/incremental/auxiliary/issue-79661.rs
index cd32a52eb..cd32a52eb 100644
--- a/src/test/incremental/auxiliary/issue-79661.rs
+++ b/tests/incremental/auxiliary/issue-79661.rs
diff --git a/src/test/incremental/auxiliary/issue-79890.rs b/tests/incremental/auxiliary/issue-79890.rs
index 8eaeafa52..8eaeafa52 100644
--- a/src/test/incremental/auxiliary/issue-79890.rs
+++ b/tests/incremental/auxiliary/issue-79890.rs
diff --git a/src/test/incremental/auxiliary/rustc-rust-log-aux.rs b/tests/incremental/auxiliary/rustc-rust-log-aux.rs
index a361373dc..a361373dc 100644
--- a/src/test/incremental/auxiliary/rustc-rust-log-aux.rs
+++ b/tests/incremental/auxiliary/rustc-rust-log-aux.rs
diff --git a/src/test/incremental/cache_file_headers.rs b/tests/incremental/cache_file_headers.rs
index 9cf611c33..9cf611c33 100644
--- a/src/test/incremental/cache_file_headers.rs
+++ b/tests/incremental/cache_file_headers.rs
diff --git a/src/test/incremental/callee_caller_cross_crate/auxiliary/a.rs b/tests/incremental/callee_caller_cross_crate/auxiliary/a.rs
index 6445f87f7..6445f87f7 100644
--- a/src/test/incremental/callee_caller_cross_crate/auxiliary/a.rs
+++ b/tests/incremental/callee_caller_cross_crate/auxiliary/a.rs
diff --git a/src/test/incremental/callee_caller_cross_crate/b.rs b/tests/incremental/callee_caller_cross_crate/b.rs
index 084ed232a..084ed232a 100644
--- a/src/test/incremental/callee_caller_cross_crate/b.rs
+++ b/tests/incremental/callee_caller_cross_crate/b.rs
diff --git a/src/test/incremental/change_add_field/struct_point.rs b/tests/incremental/change_add_field/struct_point.rs
index 3308ea562..3308ea562 100644
--- a/src/test/incremental/change_add_field/struct_point.rs
+++ b/tests/incremental/change_add_field/struct_point.rs
diff --git a/src/test/incremental/change_crate_dep_kind.rs b/tests/incremental/change_crate_dep_kind.rs
index 8c35f6ca0..8c35f6ca0 100644
--- a/src/test/incremental/change_crate_dep_kind.rs
+++ b/tests/incremental/change_crate_dep_kind.rs
diff --git a/src/test/incremental/change_crate_order/auxiliary/a.rs b/tests/incremental/change_crate_order/auxiliary/a.rs
index 1bd48714a..1bd48714a 100644
--- a/src/test/incremental/change_crate_order/auxiliary/a.rs
+++ b/tests/incremental/change_crate_order/auxiliary/a.rs
diff --git a/src/test/incremental/change_crate_order/auxiliary/b.rs b/tests/incremental/change_crate_order/auxiliary/b.rs
index 001b88912..001b88912 100644
--- a/src/test/incremental/change_crate_order/auxiliary/b.rs
+++ b/tests/incremental/change_crate_order/auxiliary/b.rs
diff --git a/src/test/incremental/change_crate_order/main.rs b/tests/incremental/change_crate_order/main.rs
index 7448b54dd..7448b54dd 100644
--- a/src/test/incremental/change_crate_order/main.rs
+++ b/tests/incremental/change_crate_order/main.rs
diff --git a/src/test/incremental/change_implementation_cross_crate/auxiliary/a.rs b/tests/incremental/change_implementation_cross_crate/auxiliary/a.rs
index 7320a97b9..7320a97b9 100644
--- a/src/test/incremental/change_implementation_cross_crate/auxiliary/a.rs
+++ b/tests/incremental/change_implementation_cross_crate/auxiliary/a.rs
diff --git a/src/test/incremental/change_implementation_cross_crate/main.rs b/tests/incremental/change_implementation_cross_crate/main.rs
index dee9ebd74..dee9ebd74 100644
--- a/src/test/incremental/change_implementation_cross_crate/main.rs
+++ b/tests/incremental/change_implementation_cross_crate/main.rs
diff --git a/src/test/incremental/change_name_of_static_in_fn.rs b/tests/incremental/change_name_of_static_in_fn.rs
index fd16ad2dc..fd16ad2dc 100644
--- a/src/test/incremental/change_name_of_static_in_fn.rs
+++ b/tests/incremental/change_name_of_static_in_fn.rs
diff --git a/src/test/incremental/change_private_fn/struct_point.rs b/tests/incremental/change_private_fn/struct_point.rs
index d57267adc..d57267adc 100644
--- a/src/test/incremental/change_private_fn/struct_point.rs
+++ b/tests/incremental/change_private_fn/struct_point.rs
diff --git a/src/test/incremental/change_private_fn_cc/auxiliary/point.rs b/tests/incremental/change_private_fn_cc/auxiliary/point.rs
index 483f20572..483f20572 100644
--- a/src/test/incremental/change_private_fn_cc/auxiliary/point.rs
+++ b/tests/incremental/change_private_fn_cc/auxiliary/point.rs
diff --git a/src/test/incremental/change_private_fn_cc/struct_point.rs b/tests/incremental/change_private_fn_cc/struct_point.rs
index 1c27ec3a3..1c27ec3a3 100644
--- a/src/test/incremental/change_private_fn_cc/struct_point.rs
+++ b/tests/incremental/change_private_fn_cc/struct_point.rs
diff --git a/src/test/incremental/change_private_impl_method/struct_point.rs b/tests/incremental/change_private_impl_method/struct_point.rs
index cf43e4757..cf43e4757 100644
--- a/src/test/incremental/change_private_impl_method/struct_point.rs
+++ b/tests/incremental/change_private_impl_method/struct_point.rs
diff --git a/src/test/incremental/change_private_impl_method_cc/auxiliary/point.rs b/tests/incremental/change_private_impl_method_cc/auxiliary/point.rs
index 2441da06b..2441da06b 100644
--- a/src/test/incremental/change_private_impl_method_cc/auxiliary/point.rs
+++ b/tests/incremental/change_private_impl_method_cc/auxiliary/point.rs
diff --git a/src/test/incremental/change_private_impl_method_cc/struct_point.rs b/tests/incremental/change_private_impl_method_cc/struct_point.rs
index 9fe8b5df9..9fe8b5df9 100644
--- a/src/test/incremental/change_private_impl_method_cc/struct_point.rs
+++ b/tests/incremental/change_private_impl_method_cc/struct_point.rs
diff --git a/src/test/incremental/change_pub_inherent_method_body/struct_point.rs b/tests/incremental/change_pub_inherent_method_body/struct_point.rs
index 1b87b18fc..1b87b18fc 100644
--- a/src/test/incremental/change_pub_inherent_method_body/struct_point.rs
+++ b/tests/incremental/change_pub_inherent_method_body/struct_point.rs
diff --git a/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs b/tests/incremental/change_pub_inherent_method_sig/struct_point.rs
index 0a6729567..0a6729567 100644
--- a/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs
+++ b/tests/incremental/change_pub_inherent_method_sig/struct_point.rs
diff --git a/src/test/incremental/change_symbol_export_status.rs b/tests/incremental/change_symbol_export_status.rs
index dd3dce4e7..83737a022 100644
--- a/src/test/incremental/change_symbol_export_status.rs
+++ b/tests/incremental/change_symbol_export_status.rs
@@ -2,8 +2,6 @@
 // compile-flags: -Zquery-dep-graph
 // [rpass1]compile-flags: -Zincremental-ignore-spans
 // [rpass2]compile-flags: -Zincremental-ignore-spans
-// [rpass3]compile-flags: -Zincremental-relative-spans
-// [rpass4]compile-flags: -Zincremental-relative-spans
 
 #![feature(rustc_attrs)]
 #![rustc_partition_reused(module = "change_symbol_export_status-mod1", cfg = "rpass2")]
diff --git a/src/test/incremental/commandline-args.rs b/tests/incremental/commandline-args.rs
index 35b7183db..35b7183db 100644
--- a/src/test/incremental/commandline-args.rs
+++ b/tests/incremental/commandline-args.rs
diff --git a/src/test/incremental/const-generics/hash-tyvid-regression-1.rs b/tests/incremental/const-generics/hash-tyvid-regression-1.rs
index 5ff7b19d8..5ff7b19d8 100644
--- a/src/test/incremental/const-generics/hash-tyvid-regression-1.rs
+++ b/tests/incremental/const-generics/hash-tyvid-regression-1.rs
diff --git a/src/test/incremental/const-generics/hash-tyvid-regression-2.rs b/tests/incremental/const-generics/hash-tyvid-regression-2.rs
index 5cdd43cd7..5cdd43cd7 100644
--- a/src/test/incremental/const-generics/hash-tyvid-regression-2.rs
+++ b/tests/incremental/const-generics/hash-tyvid-regression-2.rs
diff --git a/src/test/incremental/const-generics/hash-tyvid-regression-3.rs b/tests/incremental/const-generics/hash-tyvid-regression-3.rs
index 61f568f79..61f568f79 100644
--- a/src/test/incremental/const-generics/hash-tyvid-regression-3.rs
+++ b/tests/incremental/const-generics/hash-tyvid-regression-3.rs
diff --git a/src/test/incremental/const-generics/hash-tyvid-regression-4.rs b/tests/incremental/const-generics/hash-tyvid-regression-4.rs
index 12e8ac7ab..12e8ac7ab 100644
--- a/src/test/incremental/const-generics/hash-tyvid-regression-4.rs
+++ b/tests/incremental/const-generics/hash-tyvid-regression-4.rs
diff --git a/src/test/incremental/const-generics/issue-61338.rs b/tests/incremental/const-generics/issue-61338.rs
index e9d67fee2..e9d67fee2 100644
--- a/src/test/incremental/const-generics/issue-61338.rs
+++ b/tests/incremental/const-generics/issue-61338.rs
diff --git a/src/test/incremental/const-generics/issue-61516.rs b/tests/incremental/const-generics/issue-61516.rs
index c781484d1..c781484d1 100644
--- a/src/test/incremental/const-generics/issue-61516.rs
+++ b/tests/incremental/const-generics/issue-61516.rs
diff --git a/src/test/incremental/const-generics/issue-62536.rs b/tests/incremental/const-generics/issue-62536.rs
index 93c1dbf44..93c1dbf44 100644
--- a/src/test/incremental/const-generics/issue-62536.rs
+++ b/tests/incremental/const-generics/issue-62536.rs
diff --git a/src/test/incremental/const-generics/issue-64087.rs b/tests/incremental/const-generics/issue-64087.rs
index 81c813531..81c813531 100644
--- a/src/test/incremental/const-generics/issue-64087.rs
+++ b/tests/incremental/const-generics/issue-64087.rs
diff --git a/src/test/incremental/const-generics/issue-65623.rs b/tests/incremental/const-generics/issue-65623.rs
index 22bbcbcab..22bbcbcab 100644
--- a/src/test/incremental/const-generics/issue-65623.rs
+++ b/tests/incremental/const-generics/issue-65623.rs
diff --git a/src/test/incremental/const-generics/issue-68477.rs b/tests/incremental/const-generics/issue-68477.rs
index 9e35cf93d..9e35cf93d 100644
--- a/src/test/incremental/const-generics/issue-68477.rs
+++ b/tests/incremental/const-generics/issue-68477.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-1.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-1.rs
index 8262a2a21..8262a2a21 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-1.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-1.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-2.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-2.rs
index 92bbcba4b..92bbcba4b 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-2.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-2.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-3.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-3.rs
index fc114f224..fc114f224 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-3.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-77708-3.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-82034.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-82034.rs
index c05d8355c..c05d8355c 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-82034.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-82034.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-1.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-1.rs
index 8886a556d..8886a556d 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-1.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-1.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-3.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-3.rs
index 5b2f5edc8..5b2f5edc8 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-3.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-85031-3.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-86953.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-86953.rs
index d659c5676..d659c5676 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-86953.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-86953.rs
diff --git a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-88022.rs b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-88022.rs
index 5f5435ba9..5f5435ba9 100644
--- a/src/test/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-88022.rs
+++ b/tests/incremental/const-generics/try_unify_abstract_const_regression_tests/issue-88022.rs
diff --git a/src/test/incremental/crate_hash_reorder.rs b/tests/incremental/crate_hash_reorder.rs
index ca476b4d2..ca476b4d2 100644
--- a/src/test/incremental/crate_hash_reorder.rs
+++ b/tests/incremental/crate_hash_reorder.rs
diff --git a/src/test/incremental/cyclic-trait-hierarchy.rs b/tests/incremental/cyclic-trait-hierarchy.rs
index b502e7207..b502e7207 100644
--- a/src/test/incremental/cyclic-trait-hierarchy.rs
+++ b/tests/incremental/cyclic-trait-hierarchy.rs
diff --git a/src/test/incremental/delayed_span_bug.rs b/tests/incremental/delayed_span_bug.rs
index 2529e531e..2529e531e 100644
--- a/src/test/incremental/delayed_span_bug.rs
+++ b/tests/incremental/delayed_span_bug.rs
diff --git a/src/test/incremental/dirty_clean.rs b/tests/incremental/dirty_clean.rs
index 11d999ab3..11d999ab3 100644
--- a/src/test/incremental/dirty_clean.rs
+++ b/tests/incremental/dirty_clean.rs
diff --git a/src/test/incremental/extern_static/issue-49153.rs b/tests/incremental/extern_static/issue-49153.rs
index f1dbac288..f1dbac288 100644
--- a/src/test/incremental/extern_static/issue-49153.rs
+++ b/tests/incremental/extern_static/issue-49153.rs
diff --git a/src/test/incremental/feature_gate.rs b/tests/incremental/feature_gate.rs
index 5317a9962..5317a9962 100644
--- a/src/test/incremental/feature_gate.rs
+++ b/tests/incremental/feature_gate.rs
diff --git a/src/test/incremental/foreign.rs b/tests/incremental/foreign.rs
index f46f92eb5..f46f92eb5 100644
--- a/src/test/incremental/foreign.rs
+++ b/tests/incremental/foreign.rs
diff --git a/src/test/incremental/hash-module-order.rs b/tests/incremental/hash-module-order.rs
index fe9af9eeb..fe9af9eeb 100644
--- a/src/test/incremental/hash-module-order.rs
+++ b/tests/incremental/hash-module-order.rs
diff --git a/src/test/incremental/hashes/call_expressions.rs b/tests/incremental/hashes/call_expressions.rs
index f3a7722cd..65df2e829 100644
--- a/src/test/incremental/hashes/call_expressions.rs
+++ b/tests/incremental/hashes/call_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 
 #![allow(warnings)]
diff --git a/src/test/incremental/hashes/closure_expressions.rs b/tests/incremental/hashes/closure_expressions.rs
index c769246b2..927bcd96e 100644
--- a/src/test/incremental/hashes/closure_expressions.rs
+++ b/tests/incremental/hashes/closure_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
@@ -45,9 +42,9 @@ pub fn add_parameter() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir, typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, typeck")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, optimized_mir, typeck")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, typeck")]
 #[rustc_clean(cfg="cfail6")]
 pub fn add_parameter() {
     let x = 0u32;
diff --git a/src/test/incremental/hashes/consts.rs b/tests/incremental/hashes/consts.rs
index eaef63386..eaef63386 100644
--- a/src/test/incremental/hashes/consts.rs
+++ b/tests/incremental/hashes/consts.rs
diff --git a/src/test/incremental/hashes/enum_constructors.rs b/tests/incremental/hashes/enum_constructors.rs
index 70ef10645..db367d070 100644
--- a/src/test/incremental/hashes/enum_constructors.rs
+++ b/tests/incremental/hashes/enum_constructors.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/enum_defs.rs b/tests/incremental/hashes/enum_defs.rs
index 0f8898c38..bc83723a9 100644
--- a/src/test/incremental/hashes/enum_defs.rs
+++ b/tests/incremental/hashes/enum_defs.rs
@@ -16,9 +16,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/exported_vs_not.rs b/tests/incremental/hashes/exported_vs_not.rs
index 87fd21fd1..9ac9ae24f 100644
--- a/src/test/incremental/hashes/exported_vs_not.rs
+++ b/tests/incremental/hashes/exported_vs_not.rs
@@ -4,9 +4,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/extern_mods.rs b/tests/incremental/hashes/extern_mods.rs
index 3121abbea..1906843c7 100644
--- a/src/test/incremental/hashes/extern_mods.rs
+++ b/tests/incremental/hashes/extern_mods.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/for_loops.rs b/tests/incremental/hashes/for_loops.rs
index 16d6af016..193e792c8 100644
--- a/src/test/incremental/hashes/for_loops.rs
+++ b/tests/incremental/hashes/for_loops.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/function_interfaces.rs b/tests/incremental/hashes/function_interfaces.rs
index 3ff949fbb..182ca7d92 100644
--- a/src/test/incremental/hashes/function_interfaces.rs
+++ b/tests/incremental/hashes/function_interfaces.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(linkage)]
diff --git a/src/test/incremental/hashes/if_expressions.rs b/tests/incremental/hashes/if_expressions.rs
index cff557dcb..937fd3ac8 100644
--- a/src/test/incremental/hashes/if_expressions.rs
+++ b/tests/incremental/hashes/if_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/indexing_expressions.rs b/tests/incremental/hashes/indexing_expressions.rs
index 9ef468472..b1ac6f6fa 100644
--- a/src/test/incremental/hashes/indexing_expressions.rs
+++ b/tests/incremental/hashes/indexing_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/inherent_impls.rs b/tests/incremental/hashes/inherent_impls.rs
index 1abbff32c..285f857c9 100644
--- a/src/test/incremental/hashes/inherent_impls.rs
+++ b/tests/incremental/hashes/inherent_impls.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 
 #![allow(warnings)]
diff --git a/src/test/incremental/hashes/inline_asm.rs b/tests/incremental/hashes/inline_asm.rs
index dc878d682..3118aa135 100644
--- a/src/test/incremental/hashes/inline_asm.rs
+++ b/tests/incremental/hashes/inline_asm.rs
@@ -12,9 +12,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/let_expressions.rs b/tests/incremental/hashes/let_expressions.rs
index 01320cd51..180bf6fec 100644
--- a/src/test/incremental/hashes/let_expressions.rs
+++ b/tests/incremental/hashes/let_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/loop_expressions.rs b/tests/incremental/hashes/loop_expressions.rs
index a12cd0d02..87b86479d 100644
--- a/src/test/incremental/hashes/loop_expressions.rs
+++ b/tests/incremental/hashes/loop_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
@@ -187,9 +184,9 @@ pub fn change_continue_label() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, typeck, optimized_mir")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, optimized_mir")]
 #[rustc_clean(cfg="cfail6")]
 pub fn change_continue_label() {
     let mut _x = 0;
diff --git a/src/test/incremental/hashes/match_expressions.rs b/tests/incremental/hashes/match_expressions.rs
index fa054c7de..4429df683 100644
--- a/src/test/incremental/hashes/match_expressions.rs
+++ b/tests/incremental/hashes/match_expressions.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/panic_exprs.rs b/tests/incremental/hashes/panic_exprs.rs
index 37d10d922..37d10d922 100644
--- a/src/test/incremental/hashes/panic_exprs.rs
+++ b/tests/incremental/hashes/panic_exprs.rs
diff --git a/src/test/incremental/hashes/statics.rs b/tests/incremental/hashes/statics.rs
index 67d87f5c4..bb83f8300 100644
--- a/src/test/incremental/hashes/statics.rs
+++ b/tests/incremental/hashes/statics.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/struct_constructors.rs b/tests/incremental/hashes/struct_constructors.rs
index fc9671cb4..e50e5674c 100644
--- a/src/test/incremental/hashes/struct_constructors.rs
+++ b/tests/incremental/hashes/struct_constructors.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/struct_defs.rs b/tests/incremental/hashes/struct_defs.rs
index 7a91722d7..4a2706b4f 100644
--- a/src/test/incremental/hashes/struct_defs.rs
+++ b/tests/incremental/hashes/struct_defs.rs
@@ -16,9 +16,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/trait_defs.rs b/tests/incremental/hashes/trait_defs.rs
index c453eeceb..b583bee2f 100644
--- a/src/test/incremental/hashes/trait_defs.rs
+++ b/tests/incremental/hashes/trait_defs.rs
@@ -16,9 +16,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/trait_impls.rs b/tests/incremental/hashes/trait_impls.rs
index f555f555f..3b2e18d17 100644
--- a/src/test/incremental/hashes/trait_impls.rs
+++ b/tests/incremental/hashes/trait_impls.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/type_defs.rs b/tests/incremental/hashes/type_defs.rs
index 79398eb07..79398eb07 100644
--- a/src/test/incremental/hashes/type_defs.rs
+++ b/tests/incremental/hashes/type_defs.rs
diff --git a/src/test/incremental/hashes/unary_and_binary_exprs.rs b/tests/incremental/hashes/unary_and_binary_exprs.rs
index 18fb71635..58af51eef 100644
--- a/src/test/incremental/hashes/unary_and_binary_exprs.rs
+++ b/tests/incremental/hashes/unary_and_binary_exprs.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
diff --git a/src/test/incremental/hashes/while_let_loops.rs b/tests/incremental/hashes/while_let_loops.rs
index f81855e42..c81b0d0af 100644
--- a/src/test/incremental/hashes/while_let_loops.rs
+++ b/tests/incremental/hashes/while_let_loops.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
@@ -158,9 +155,9 @@ pub fn change_break_label() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail6")]
 pub fn change_break_label() {
     let mut _x = 0;
@@ -210,9 +207,9 @@ pub fn change_continue_label() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail6")]
 pub fn change_continue_label() {
     let mut _x = 0;
diff --git a/src/test/incremental/hashes/while_loops.rs b/tests/incremental/hashes/while_loops.rs
index e432cf8fe..c1cc0b62b 100644
--- a/src/test/incremental/hashes/while_loops.rs
+++ b/tests/incremental/hashes/while_loops.rs
@@ -11,9 +11,6 @@
 // [cfail1]compile-flags: -Zincremental-ignore-spans
 // [cfail2]compile-flags: -Zincremental-ignore-spans
 // [cfail3]compile-flags: -Zincremental-ignore-spans
-// [cfail4]compile-flags: -Zincremental-relative-spans
-// [cfail5]compile-flags: -Zincremental-relative-spans
-// [cfail6]compile-flags: -Zincremental-relative-spans
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
@@ -158,9 +155,9 @@ pub fn change_break_label() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir")]
 #[rustc_clean(cfg="cfail6")]
 pub fn change_break_label() {
     let mut _x = 0;
@@ -212,9 +209,9 @@ pub fn change_continue_label() {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
+#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck,optimized_mir")]
+#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir")]
 #[rustc_clean(cfg="cfail6")]
 pub fn change_continue_label() {
     let mut _x = 0;
diff --git a/src/test/incremental/hello_world.rs b/tests/incremental/hello_world.rs
index d5ec6e92b..d5ec6e92b 100644
--- a/src/test/incremental/hello_world.rs
+++ b/tests/incremental/hello_world.rs
diff --git a/src/test/incremental/hygiene/auxiliary/cached_hygiene.rs b/tests/incremental/hygiene/auxiliary/cached_hygiene.rs
index b31f60e97..b31f60e97 100644
--- a/src/test/incremental/hygiene/auxiliary/cached_hygiene.rs
+++ b/tests/incremental/hygiene/auxiliary/cached_hygiene.rs
diff --git a/src/test/incremental/hygiene/load_cached_hygiene.rs b/tests/incremental/hygiene/load_cached_hygiene.rs
index 355d33458..355d33458 100644
--- a/src/test/incremental/hygiene/load_cached_hygiene.rs
+++ b/tests/incremental/hygiene/load_cached_hygiene.rs
diff --git a/src/test/incremental/ich_method_call_trait_scope.rs b/tests/incremental/ich_method_call_trait_scope.rs
index 5566506c0..5566506c0 100644
--- a/src/test/incremental/ich_method_call_trait_scope.rs
+++ b/tests/incremental/ich_method_call_trait_scope.rs
diff --git a/src/test/incremental/ich_nested_items.rs b/tests/incremental/ich_nested_items.rs
index 379c09575..379c09575 100644
--- a/src/test/incremental/ich_nested_items.rs
+++ b/tests/incremental/ich_nested_items.rs
diff --git a/src/test/incremental/ich_resolve_results.rs b/tests/incremental/ich_resolve_results.rs
index e6ab6bceb..e6ab6bceb 100644
--- a/src/test/incremental/ich_resolve_results.rs
+++ b/tests/incremental/ich_resolve_results.rs
diff --git a/src/test/incremental/incremental_proc_macro.rs b/tests/incremental/incremental_proc_macro.rs
index becc1538f..becc1538f 100644
--- a/src/test/incremental/incremental_proc_macro.rs
+++ b/tests/incremental/incremental_proc_macro.rs
diff --git a/src/test/incremental/inlined_hir_34991/main.rs b/tests/incremental/inlined_hir_34991/main.rs
index bb76a0bb8..bb76a0bb8 100644
--- a/src/test/incremental/inlined_hir_34991/main.rs
+++ b/tests/incremental/inlined_hir_34991/main.rs
diff --git a/src/test/incremental/issue-100521-change-struct-name-assocty.rs b/tests/incremental/issue-100521-change-struct-name-assocty.rs
index 7f8d1e608..7f8d1e608 100644
--- a/src/test/incremental/issue-100521-change-struct-name-assocty.rs
+++ b/tests/incremental/issue-100521-change-struct-name-assocty.rs
diff --git a/src/test/incremental/issue-101518.rs b/tests/incremental/issue-101518.rs
index 501be175f..501be175f 100644
--- a/src/test/incremental/issue-101518.rs
+++ b/tests/incremental/issue-101518.rs
diff --git a/src/test/incremental/issue-35593.rs b/tests/incremental/issue-35593.rs
index 009e37d17..009e37d17 100644
--- a/src/test/incremental/issue-35593.rs
+++ b/tests/incremental/issue-35593.rs
diff --git a/src/test/incremental/issue-38222.rs b/tests/incremental/issue-38222.rs
index 20d4d4200..20d4d4200 100644
--- a/src/test/incremental/issue-38222.rs
+++ b/tests/incremental/issue-38222.rs
diff --git a/src/test/incremental/issue-39569.rs b/tests/incremental/issue-39569.rs
index 881ecfca7..881ecfca7 100644
--- a/src/test/incremental/issue-39569.rs
+++ b/tests/incremental/issue-39569.rs
diff --git a/src/test/incremental/issue-39828/auxiliary/generic.rs b/tests/incremental/issue-39828/auxiliary/generic.rs
index a5bb0d65f..a5bb0d65f 100644
--- a/src/test/incremental/issue-39828/auxiliary/generic.rs
+++ b/tests/incremental/issue-39828/auxiliary/generic.rs
diff --git a/src/test/incremental/issue-39828/issue-39828.rs b/tests/incremental/issue-39828/issue-39828.rs
index 8cef916ff..8cef916ff 100644
--- a/src/test/incremental/issue-39828/issue-39828.rs
+++ b/tests/incremental/issue-39828/issue-39828.rs
diff --git a/src/test/incremental/issue-42602.rs b/tests/incremental/issue-42602.rs
index b8d5303fb..b8d5303fb 100644
--- a/src/test/incremental/issue-42602.rs
+++ b/tests/incremental/issue-42602.rs
diff --git a/src/test/incremental/issue-49043.rs b/tests/incremental/issue-49043.rs
index 8d13718b8..8d13718b8 100644
--- a/src/test/incremental/issue-49043.rs
+++ b/tests/incremental/issue-49043.rs
diff --git a/src/test/incremental/issue-49482.rs b/tests/incremental/issue-49482.rs
index 042ecc0f2..042ecc0f2 100644
--- a/src/test/incremental/issue-49482.rs
+++ b/tests/incremental/issue-49482.rs
diff --git a/src/test/incremental/issue-49595/auxiliary/lit_a.rs b/tests/incremental/issue-49595/auxiliary/lit_a.rs
index 295a0b481..295a0b481 100644
--- a/src/test/incremental/issue-49595/auxiliary/lit_a.rs
+++ b/tests/incremental/issue-49595/auxiliary/lit_a.rs
diff --git a/src/test/incremental/issue-49595/auxiliary/lit_b.rs b/tests/incremental/issue-49595/auxiliary/lit_b.rs
index 5d377edfb..5d377edfb 100644
--- a/src/test/incremental/issue-49595/auxiliary/lit_b.rs
+++ b/tests/incremental/issue-49595/auxiliary/lit_b.rs
diff --git a/src/test/incremental/issue-49595/issue-49595.rs b/tests/incremental/issue-49595/issue-49595.rs
index 7b1096a64..7b1096a64 100644
--- a/src/test/incremental/issue-49595/issue-49595.rs
+++ b/tests/incremental/issue-49595/issue-49595.rs
diff --git a/src/test/incremental/issue-51409.rs b/tests/incremental/issue-51409.rs
index 280094ec0..280094ec0 100644
--- a/src/test/incremental/issue-51409.rs
+++ b/tests/incremental/issue-51409.rs
diff --git a/src/test/incremental/issue-54059.rs b/tests/incremental/issue-54059.rs
index 0a5a54750..0a5a54750 100644
--- a/src/test/incremental/issue-54059.rs
+++ b/tests/incremental/issue-54059.rs
diff --git a/src/test/incremental/issue-54242.rs b/tests/incremental/issue-54242.rs
index 806c84152..806c84152 100644
--- a/src/test/incremental/issue-54242.rs
+++ b/tests/incremental/issue-54242.rs
diff --git a/src/test/incremental/issue-59523-on-implemented-is-not-unused.rs b/tests/incremental/issue-59523-on-implemented-is-not-unused.rs
index fa52ca90b..fa52ca90b 100644
--- a/src/test/incremental/issue-59523-on-implemented-is-not-unused.rs
+++ b/tests/incremental/issue-59523-on-implemented-is-not-unused.rs
diff --git a/src/test/incremental/issue-59524-layout-scalar-valid-range-is-not-unused.rs b/tests/incremental/issue-59524-layout-scalar-valid-range-is-not-unused.rs
index bfb5e539c..bfb5e539c 100644
--- a/src/test/incremental/issue-59524-layout-scalar-valid-range-is-not-unused.rs
+++ b/tests/incremental/issue-59524-layout-scalar-valid-range-is-not-unused.rs
diff --git a/src/test/incremental/issue-60629.rs b/tests/incremental/issue-60629.rs
index 4807af4b3..4807af4b3 100644
--- a/src/test/incremental/issue-60629.rs
+++ b/tests/incremental/issue-60629.rs
diff --git a/src/test/incremental/issue-61323.rs b/tests/incremental/issue-61323.rs
index 7ce47947c..7ce47947c 100644
--- a/src/test/incremental/issue-61323.rs
+++ b/tests/incremental/issue-61323.rs
diff --git a/src/test/incremental/issue-61530.rs b/tests/incremental/issue-61530.rs
index edb3d60ba..edb3d60ba 100644
--- a/src/test/incremental/issue-61530.rs
+++ b/tests/incremental/issue-61530.rs
diff --git a/src/test/incremental/issue-62649-path-collisions-happen.rs b/tests/incremental/issue-62649-path-collisions-happen.rs
index ee81be76b..ee81be76b 100644
--- a/src/test/incremental/issue-62649-path-collisions-happen.rs
+++ b/tests/incremental/issue-62649-path-collisions-happen.rs
diff --git a/src/test/incremental/issue-69596.rs b/tests/incremental/issue-69596.rs
index dc587fdc4..dc587fdc4 100644
--- a/src/test/incremental/issue-69596.rs
+++ b/tests/incremental/issue-69596.rs
diff --git a/src/test/incremental/issue-72386.rs b/tests/incremental/issue-72386.rs
index 5917152e1..5917152e1 100644
--- a/src/test/incremental/issue-72386.rs
+++ b/tests/incremental/issue-72386.rs
diff --git a/src/test/incremental/issue-79661-missing-def-path-hash.rs b/tests/incremental/issue-79661-missing-def-path-hash.rs
index f86fb33fb..f86fb33fb 100644
--- a/src/test/incremental/issue-79661-missing-def-path-hash.rs
+++ b/tests/incremental/issue-79661-missing-def-path-hash.rs
diff --git a/src/test/incremental/issue-79890-imported-crates-changed.rs b/tests/incremental/issue-79890-imported-crates-changed.rs
index 93daa5ca9..93daa5ca9 100644
--- a/src/test/incremental/issue-79890-imported-crates-changed.rs
+++ b/tests/incremental/issue-79890-imported-crates-changed.rs
diff --git a/src/test/incremental/issue-80336-invalid-span.rs b/tests/incremental/issue-80336-invalid-span.rs
index 7757d9159..7757d9159 100644
--- a/src/test/incremental/issue-80336-invalid-span.rs
+++ b/tests/incremental/issue-80336-invalid-span.rs
diff --git a/src/test/incremental/issue-80691-bad-eval-cache.rs b/tests/incremental/issue-80691-bad-eval-cache.rs
index 1a644fd88..1a644fd88 100644
--- a/src/test/incremental/issue-80691-bad-eval-cache.rs
+++ b/tests/incremental/issue-80691-bad-eval-cache.rs
diff --git a/src/test/incremental/issue-82920-predicate-order-miscompile.rs b/tests/incremental/issue-82920-predicate-order-miscompile.rs
index 793af679c..793af679c 100644
--- a/src/test/incremental/issue-82920-predicate-order-miscompile.rs
+++ b/tests/incremental/issue-82920-predicate-order-miscompile.rs
diff --git a/src/test/incremental/issue-84252-global-alloc.rs b/tests/incremental/issue-84252-global-alloc.rs
index d2438df89..d2438df89 100644
--- a/src/test/incremental/issue-84252-global-alloc.rs
+++ b/tests/incremental/issue-84252-global-alloc.rs
diff --git a/src/test/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs b/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs
index 2453af5b6..2453af5b6 100644
--- a/src/test/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs
+++ b/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs
diff --git a/src/test/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-mod.rs b/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-mod.rs
index 747174b1e..747174b1e 100644
--- a/src/test/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-mod.rs
+++ b/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-mod.rs
diff --git a/src/test/incremental/issue-85197-invalid-span/auxiliary/respan.rs b/tests/incremental/issue-85197-invalid-span/auxiliary/respan.rs
index 5088eab62..5088eab62 100644
--- a/src/test/incremental/issue-85197-invalid-span/auxiliary/respan.rs
+++ b/tests/incremental/issue-85197-invalid-span/auxiliary/respan.rs
diff --git a/src/test/incremental/issue-85197-invalid-span/invalid_span_main.rs b/tests/incremental/issue-85197-invalid-span/invalid_span_main.rs
index f358460b3..f358460b3 100644
--- a/src/test/incremental/issue-85197-invalid-span/invalid_span_main.rs
+++ b/tests/incremental/issue-85197-invalid-span/invalid_span_main.rs
diff --git a/src/test/incremental/issue-85360-eval-obligation-ice.rs b/tests/incremental/issue-85360-eval-obligation-ice.rs
index 1796c9d19..1796c9d19 100644
--- a/src/test/incremental/issue-85360-eval-obligation-ice.rs
+++ b/tests/incremental/issue-85360-eval-obligation-ice.rs
diff --git a/src/test/incremental/issue-86753.rs b/tests/incremental/issue-86753.rs
index 4d6c4354e..4d6c4354e 100644
--- a/src/test/incremental/issue-86753.rs
+++ b/tests/incremental/issue-86753.rs
diff --git a/src/test/incremental/issue-92163-missing-sourcefile/auxiliary/first_crate.rs b/tests/incremental/issue-92163-missing-sourcefile/auxiliary/first_crate.rs
index 134afd4fb..134afd4fb 100644
--- a/src/test/incremental/issue-92163-missing-sourcefile/auxiliary/first_crate.rs
+++ b/tests/incremental/issue-92163-missing-sourcefile/auxiliary/first_crate.rs
diff --git a/src/test/incremental/issue-92163-missing-sourcefile/auxiliary/second_crate.rs b/tests/incremental/issue-92163-missing-sourcefile/auxiliary/second_crate.rs
index ab7961f38..ab7961f38 100644
--- a/src/test/incremental/issue-92163-missing-sourcefile/auxiliary/second_crate.rs
+++ b/tests/incremental/issue-92163-missing-sourcefile/auxiliary/second_crate.rs
diff --git a/src/test/incremental/issue-92163-missing-sourcefile/issue_92163_main.rs b/tests/incremental/issue-92163-missing-sourcefile/issue_92163_main.rs
index e9219c6f5..e9219c6f5 100644
--- a/src/test/incremental/issue-92163-missing-sourcefile/issue_92163_main.rs
+++ b/tests/incremental/issue-92163-missing-sourcefile/issue_92163_main.rs
diff --git a/src/test/incremental/issue-92987-provisional-dep-node.rs b/tests/incremental/issue-92987-provisional-dep-node.rs
index a48a8373c..a48a8373c 100644
--- a/src/test/incremental/issue-92987-provisional-dep-node.rs
+++ b/tests/incremental/issue-92987-provisional-dep-node.rs
diff --git a/src/test/incremental/issue-96319-coinductive-cycle.rs b/tests/incremental/issue-96319-coinductive-cycle.rs
index b5ff9112a..b5ff9112a 100644
--- a/src/test/incremental/issue-96319-coinductive-cycle.rs
+++ b/tests/incremental/issue-96319-coinductive-cycle.rs
diff --git a/src/test/incremental/krate-inherent.rs b/tests/incremental/krate-inherent.rs
index 2c04e1105..2c04e1105 100644
--- a/src/test/incremental/krate-inherent.rs
+++ b/tests/incremental/krate-inherent.rs
diff --git a/src/test/incremental/krate-inlined.rs b/tests/incremental/krate-inlined.rs
index 6b1db74a3..6b1db74a3 100644
--- a/src/test/incremental/krate-inlined.rs
+++ b/tests/incremental/krate-inlined.rs
diff --git a/src/test/incremental/krate_reassign_34991/auxiliary/a.rs b/tests/incremental/krate_reassign_34991/auxiliary/a.rs
index 69be8d3bc..69be8d3bc 100644
--- a/src/test/incremental/krate_reassign_34991/auxiliary/a.rs
+++ b/tests/incremental/krate_reassign_34991/auxiliary/a.rs
diff --git a/src/test/incremental/krate_reassign_34991/main.rs b/tests/incremental/krate_reassign_34991/main.rs
index c4ae19ac9..c4ae19ac9 100644
--- a/src/test/incremental/krate_reassign_34991/main.rs
+++ b/tests/incremental/krate_reassign_34991/main.rs
diff --git a/src/test/incremental/link_order/auxiliary/my_lib.rs b/tests/incremental/link_order/auxiliary/my_lib.rs
index 1e7d82305..1e7d82305 100644
--- a/src/test/incremental/link_order/auxiliary/my_lib.rs
+++ b/tests/incremental/link_order/auxiliary/my_lib.rs
diff --git a/src/test/incremental/link_order/main.rs b/tests/incremental/link_order/main.rs
index d211c295b..d211c295b 100644
--- a/src/test/incremental/link_order/main.rs
+++ b/tests/incremental/link_order/main.rs
diff --git a/src/test/incremental/lto-in-linker.rs b/tests/incremental/lto-in-linker.rs
index 0e8c1ebb9..0e8c1ebb9 100644
--- a/src/test/incremental/lto-in-linker.rs
+++ b/tests/incremental/lto-in-linker.rs
diff --git a/src/test/incremental/lto.rs b/tests/incremental/lto.rs
index 2a3e3c246..2a3e3c246 100644
--- a/src/test/incremental/lto.rs
+++ b/tests/incremental/lto.rs
diff --git a/src/test/incremental/macro_export.rs b/tests/incremental/macro_export.rs
index 044d63fd2..044d63fd2 100644
--- a/src/test/incremental/macro_export.rs
+++ b/tests/incremental/macro_export.rs
diff --git a/src/test/incremental/mir-opt.rs b/tests/incremental/mir-opt.rs
index 5bd863439..5bd863439 100644
--- a/src/test/incremental/mir-opt.rs
+++ b/tests/incremental/mir-opt.rs
diff --git a/src/test/incremental/no_mangle.rs b/tests/incremental/no_mangle.rs
index b1c9b2bc3..b1c9b2bc3 100644
--- a/src/test/incremental/no_mangle.rs
+++ b/tests/incremental/no_mangle.rs
diff --git a/src/test/incremental/remapped_paths_cc/auxiliary/extern_crate.rs b/tests/incremental/remapped_paths_cc/auxiliary/extern_crate.rs
index 627b99445..627b99445 100644
--- a/src/test/incremental/remapped_paths_cc/auxiliary/extern_crate.rs
+++ b/tests/incremental/remapped_paths_cc/auxiliary/extern_crate.rs
diff --git a/src/test/incremental/remapped_paths_cc/main.rs b/tests/incremental/remapped_paths_cc/main.rs
index b01f02444..b01f02444 100644
--- a/src/test/incremental/remapped_paths_cc/main.rs
+++ b/tests/incremental/remapped_paths_cc/main.rs
diff --git a/src/test/incremental/remove-private-item-cross-crate/auxiliary/a.rs b/tests/incremental/remove-private-item-cross-crate/auxiliary/a.rs
index 279a6f078..279a6f078 100644
--- a/src/test/incremental/remove-private-item-cross-crate/auxiliary/a.rs
+++ b/tests/incremental/remove-private-item-cross-crate/auxiliary/a.rs
diff --git a/src/test/incremental/remove-private-item-cross-crate/main.rs b/tests/incremental/remove-private-item-cross-crate/main.rs
index c831ab6fe..c831ab6fe 100644
--- a/src/test/incremental/remove-private-item-cross-crate/main.rs
+++ b/tests/incremental/remove-private-item-cross-crate/main.rs
diff --git a/src/test/incremental/remove_crate/auxiliary/extern_crate.rs b/tests/incremental/remove_crate/auxiliary/extern_crate.rs
index 1cafdf49d..1cafdf49d 100644
--- a/src/test/incremental/remove_crate/auxiliary/extern_crate.rs
+++ b/tests/incremental/remove_crate/auxiliary/extern_crate.rs
diff --git a/src/test/incremental/remove_crate/main.rs b/tests/incremental/remove_crate/main.rs
index 14b80df0d..14b80df0d 100644
--- a/src/test/incremental/remove_crate/main.rs
+++ b/tests/incremental/remove_crate/main.rs
diff --git a/src/test/incremental/remove_source_file/auxiliary/mod.rs b/tests/incremental/remove_source_file/auxiliary/mod.rs
index 96a366d96..96a366d96 100644
--- a/src/test/incremental/remove_source_file/auxiliary/mod.rs
+++ b/tests/incremental/remove_source_file/auxiliary/mod.rs
diff --git a/src/test/incremental/remove_source_file/main.rs b/tests/incremental/remove_source_file/main.rs
index b2411c094..b2411c094 100644
--- a/src/test/incremental/remove_source_file/main.rs
+++ b/tests/incremental/remove_source_file/main.rs
diff --git a/src/test/incremental/reorder_vtable.rs b/tests/incremental/reorder_vtable.rs
index 8dacba633..8dacba633 100644
--- a/src/test/incremental/reorder_vtable.rs
+++ b/tests/incremental/reorder_vtable.rs
diff --git a/src/test/incremental/rlib-lto.rs b/tests/incremental/rlib-lto.rs
index 752fee5a0..752fee5a0 100644
--- a/src/test/incremental/rlib-lto.rs
+++ b/tests/incremental/rlib-lto.rs
diff --git a/src/test/incremental/rlib_cross_crate/auxiliary/a.rs b/tests/incremental/rlib_cross_crate/auxiliary/a.rs
index 5a26df9ae..5a26df9ae 100644
--- a/src/test/incremental/rlib_cross_crate/auxiliary/a.rs
+++ b/tests/incremental/rlib_cross_crate/auxiliary/a.rs
diff --git a/src/test/incremental/rlib_cross_crate/b.rs b/tests/incremental/rlib_cross_crate/b.rs
index 639cfc918..639cfc918 100644
--- a/src/test/incremental/rlib_cross_crate/b.rs
+++ b/tests/incremental/rlib_cross_crate/b.rs
diff --git a/src/test/incremental/rustc-rust-log.rs b/tests/incremental/rustc-rust-log.rs
index 566f0d96d..566f0d96d 100644
--- a/src/test/incremental/rustc-rust-log.rs
+++ b/tests/incremental/rustc-rust-log.rs
diff --git a/src/test/incremental/source_loc_macros.rs b/tests/incremental/source_loc_macros.rs
index e5f04e5dc..e5f04e5dc 100644
--- a/src/test/incremental/source_loc_macros.rs
+++ b/tests/incremental/source_loc_macros.rs
diff --git a/src/test/incremental/span_hash_stable/auxiliary/mod.rs b/tests/incremental/span_hash_stable/auxiliary/mod.rs
index f3824db4c..f3824db4c 100644
--- a/src/test/incremental/span_hash_stable/auxiliary/mod.rs
+++ b/tests/incremental/span_hash_stable/auxiliary/mod.rs
diff --git a/src/test/incremental/span_hash_stable/auxiliary/sub1.rs b/tests/incremental/span_hash_stable/auxiliary/sub1.rs
index 70e2ea06b..70e2ea06b 100644
--- a/src/test/incremental/span_hash_stable/auxiliary/sub1.rs
+++ b/tests/incremental/span_hash_stable/auxiliary/sub1.rs
diff --git a/src/test/incremental/span_hash_stable/auxiliary/sub2.rs b/tests/incremental/span_hash_stable/auxiliary/sub2.rs
index 1167cdb0a..1167cdb0a 100644
--- a/src/test/incremental/span_hash_stable/auxiliary/sub2.rs
+++ b/tests/incremental/span_hash_stable/auxiliary/sub2.rs
diff --git a/src/test/incremental/span_hash_stable/main.rs b/tests/incremental/span_hash_stable/main.rs
index 367416430..367416430 100644
--- a/src/test/incremental/span_hash_stable/main.rs
+++ b/tests/incremental/span_hash_stable/main.rs
diff --git a/src/test/incremental/spans_in_type_debuginfo.rs b/tests/incremental/spans_in_type_debuginfo.rs
index f5cae15a4..f5cae15a4 100644
--- a/src/test/incremental/spans_in_type_debuginfo.rs
+++ b/tests/incremental/spans_in_type_debuginfo.rs
diff --git a/tests/incremental/spans_significant_w_debuginfo.rs b/tests/incremental/spans_significant_w_debuginfo.rs
new file mode 100644
index 000000000..38ab28461
--- /dev/null
+++ b/tests/incremental/spans_significant_w_debuginfo.rs
@@ -0,0 +1,17 @@
+// This test makes sure that just changing a definition's location in the
+// source file also changes its incr. comp. hash, if debuginfo is enabled.
+
+// revisions:rpass1 rpass2
+
+// ignore-asmjs wasm2js does not support source maps yet
+// compile-flags: -g -Z query-dep-graph
+
+#![feature(rustc_attrs)]
+#![rustc_partition_codegened(module = "spans_significant_w_debuginfo", cfg = "rpass2")]
+
+#[cfg(rpass1)]
+pub fn main() {}
+
+#[cfg(rpass2)]
+#[rustc_clean(cfg = "rpass2")]
+pub fn main() {}
diff --git a/tests/incremental/spans_significant_w_panic.rs b/tests/incremental/spans_significant_w_panic.rs
new file mode 100644
index 000000000..085e4cd78
--- /dev/null
+++ b/tests/incremental/spans_significant_w_panic.rs
@@ -0,0 +1,24 @@
+// This test makes sure that just changing a definition's location in the
+// source file also changes its incr. comp. hash, if debuginfo is enabled.
+
+// revisions:rpass1 rpass2
+
+// compile-flags: -C overflow-checks=on -Z query-dep-graph
+
+#![feature(rustc_attrs)]
+#![rustc_partition_codegened(module = "spans_significant_w_panic", cfg = "rpass2")]
+
+#[cfg(rpass1)]
+pub fn main() {
+    if std::hint::black_box(false) {
+        panic!()
+    }
+}
+
+#[cfg(rpass2)]
+#[rustc_clean(cfg = "rpass2")]
+pub fn main() {
+    if std::hint::black_box(false) {
+        panic!()
+    }
+}
diff --git a/src/test/incremental/spike-neg1.rs b/tests/incremental/spike-neg1.rs
index 97812ffe3..97812ffe3 100644
--- a/src/test/incremental/spike-neg1.rs
+++ b/tests/incremental/spike-neg1.rs
diff --git a/src/test/incremental/spike-neg2.rs b/tests/incremental/spike-neg2.rs
index 3bb1914fd..3bb1914fd 100644
--- a/src/test/incremental/spike-neg2.rs
+++ b/tests/incremental/spike-neg2.rs
diff --git a/src/test/incremental/spike.rs b/tests/incremental/spike.rs
index a6a05e7c3..a6a05e7c3 100644
--- a/src/test/incremental/spike.rs
+++ b/tests/incremental/spike.rs
diff --git a/src/test/incremental/split_debuginfo_cached.rs b/tests/incremental/split_debuginfo_cached.rs
index ba8385f89..ba8385f89 100644
--- a/src/test/incremental/split_debuginfo_cached.rs
+++ b/tests/incremental/split_debuginfo_cached.rs
diff --git a/src/test/incremental/split_debuginfo_mode.rs b/tests/incremental/split_debuginfo_mode.rs
index edc1a80d3..edc1a80d3 100644
--- a/src/test/incremental/split_debuginfo_mode.rs
+++ b/tests/incremental/split_debuginfo_mode.rs
diff --git a/src/test/incremental/static_cycle/b.rs b/tests/incremental/static_cycle/b.rs
index 064213fba..064213fba 100644
--- a/src/test/incremental/static_cycle/b.rs
+++ b/tests/incremental/static_cycle/b.rs
diff --git a/src/test/incremental/static_refering_to_other_static/issue-49081.rs b/tests/incremental/static_refering_to_other_static/issue-49081.rs
index 8e3715d1d..8e3715d1d 100644
--- a/src/test/incremental/static_refering_to_other_static/issue-49081.rs
+++ b/tests/incremental/static_refering_to_other_static/issue-49081.rs
diff --git a/src/test/incremental/static_refering_to_other_static2/issue.rs b/tests/incremental/static_refering_to_other_static2/issue.rs
index 720bb1e22..720bb1e22 100644
--- a/src/test/incremental/static_refering_to_other_static2/issue.rs
+++ b/tests/incremental/static_refering_to_other_static2/issue.rs
diff --git a/src/test/incremental/static_refering_to_other_static3/issue.rs b/tests/incremental/static_refering_to_other_static3/issue.rs
index 80999813d..80999813d 100644
--- a/src/test/incremental/static_refering_to_other_static3/issue.rs
+++ b/tests/incremental/static_refering_to_other_static3/issue.rs
diff --git a/src/test/incremental/static_stable_hash/issue-49301.rs b/tests/incremental/static_stable_hash/issue-49301.rs
index fdd05c72c..fdd05c72c 100644
--- a/src/test/incremental/static_stable_hash/issue-49301.rs
+++ b/tests/incremental/static_stable_hash/issue-49301.rs
diff --git a/tests/incremental/string_constant.rs b/tests/incremental/string_constant.rs
new file mode 100644
index 000000000..e15a8d18f
--- /dev/null
+++ b/tests/incremental/string_constant.rs
@@ -0,0 +1,42 @@
+// revisions: cfail1 cfail2
+// compile-flags: -Z query-dep-graph
+// build-pass (FIXME(62277): could be check-pass?)
+
+#![allow(warnings)]
+#![feature(rustc_attrs)]
+#![crate_type = "rlib"]
+
+// Here the only thing which changes is the string constant in `x`.
+// Therefore, the compiler deduces (correctly) that typeck is not
+// needed even for callers of `x`.
+
+pub mod x {
+    #[cfg(cfail1)]
+    pub fn x() {
+        println!("{}", "1");
+    }
+
+    #[cfg(cfail2)]
+    #[rustc_clean(except = "hir_owner_nodes,promoted_mir", cfg = "cfail2")]
+    pub fn x() {
+        println!("{}", "2");
+    }
+}
+
+pub mod y {
+    use x;
+
+    #[rustc_clean(cfg = "cfail2")]
+    pub fn y() {
+        x::x();
+    }
+}
+
+pub mod z {
+    use y;
+
+    #[rustc_clean(cfg = "cfail2")]
+    pub fn z() {
+        y::y();
+    }
+}
diff --git a/src/test/incremental/struct_add_field.rs b/tests/incremental/struct_add_field.rs
index 720854f16..720854f16 100644
--- a/src/test/incremental/struct_add_field.rs
+++ b/tests/incremental/struct_add_field.rs
diff --git a/src/test/incremental/struct_change_field_name.rs b/tests/incremental/struct_change_field_name.rs
index a7c79e9d7..a7c79e9d7 100644
--- a/src/test/incremental/struct_change_field_name.rs
+++ b/tests/incremental/struct_change_field_name.rs
diff --git a/src/test/incremental/struct_change_field_type.rs b/tests/incremental/struct_change_field_type.rs
index 37d2fba99..37d2fba99 100644
--- a/src/test/incremental/struct_change_field_type.rs
+++ b/tests/incremental/struct_change_field_type.rs
diff --git a/src/test/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs b/tests/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs
index d3ddb32c3..d3ddb32c3 100644
--- a/src/test/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs
+++ b/tests/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs
diff --git a/src/test/incremental/struct_change_field_type_cross_crate/b.rs b/tests/incremental/struct_change_field_type_cross_crate/b.rs
index c78207bcb..c78207bcb 100644
--- a/src/test/incremental/struct_change_field_type_cross_crate/b.rs
+++ b/tests/incremental/struct_change_field_type_cross_crate/b.rs
diff --git a/src/test/incremental/struct_change_nothing.rs b/tests/incremental/struct_change_nothing.rs
index de30c818c..de30c818c 100644
--- a/src/test/incremental/struct_change_nothing.rs
+++ b/tests/incremental/struct_change_nothing.rs
diff --git a/src/test/incremental/struct_remove_field.rs b/tests/incremental/struct_remove_field.rs
index b97a87e09..b97a87e09 100644
--- a/src/test/incremental/struct_remove_field.rs
+++ b/tests/incremental/struct_remove_field.rs
diff --git a/src/test/incremental/thinlto/cgu_invalidated_via_import.rs b/tests/incremental/thinlto/cgu_invalidated_via_import.rs
index 5fe435d79..5fe435d79 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_via_import.rs
+++ b/tests/incremental/thinlto/cgu_invalidated_via_import.rs
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_export_added.rs b/tests/incremental/thinlto/cgu_invalidated_when_export_added.rs
index 95f3b8ae4..95f3b8ae4 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_when_export_added.rs
+++ b/tests/incremental/thinlto/cgu_invalidated_when_export_added.rs
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_export_removed.rs b/tests/incremental/thinlto/cgu_invalidated_when_export_removed.rs
index e86ebd354..e86ebd354 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_when_export_removed.rs
+++ b/tests/incremental/thinlto/cgu_invalidated_when_export_removed.rs
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs b/tests/incremental/thinlto/cgu_invalidated_when_import_added.rs
index 9c17c8745..9c17c8745 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs
+++ b/tests/incremental/thinlto/cgu_invalidated_when_import_added.rs
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs b/tests/incremental/thinlto/cgu_invalidated_when_import_removed.rs
index fc53acf75..fc53acf75 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs
+++ b/tests/incremental/thinlto/cgu_invalidated_when_import_removed.rs
diff --git a/tests/incremental/thinlto/cgu_keeps_identical_fn.rs b/tests/incremental/thinlto/cgu_keeps_identical_fn.rs
new file mode 100644
index 000000000..368a726ea
--- /dev/null
+++ b/tests/incremental/thinlto/cgu_keeps_identical_fn.rs
@@ -0,0 +1,49 @@
+// This test is almost identical to `cgu_invalided_via_import`, except that
+// the two versions of `inline_fn` are identical. Neither version of `inlined_fn`
+// ends up with any spans in its LLVM bitecode, so LLVM is able to skip
+// re-building any modules which import 'inlined_fn'
+
+// revisions: cfail1 cfail2 cfail3
+// compile-flags: -Z query-dep-graph -O
+// build-pass (FIXME(62277): could be check-pass?)
+
+#![feature(rustc_attrs)]
+#![crate_type = "rlib"]
+#![rustc_expected_cgu_reuse(module = "cgu_keeps_identical_fn-foo", cfg = "cfail2", kind = "no")]
+#![rustc_expected_cgu_reuse(
+    module = "cgu_keeps_identical_fn-foo",
+    cfg = "cfail3",
+    kind = "post-lto"
+)]
+#![rustc_expected_cgu_reuse(
+    module = "cgu_keeps_identical_fn-bar",
+    cfg = "cfail2",
+    kind = "post-lto"
+)]
+#![rustc_expected_cgu_reuse(
+    module = "cgu_keeps_identical_fn-bar",
+    cfg = "cfail3",
+    kind = "post-lto"
+)]
+
+mod foo {
+
+    // Trivial functions like this one are imported very reliably by ThinLTO.
+    #[cfg(any(cfail1, cfail4))]
+    pub fn inlined_fn() -> u32 {
+        1234
+    }
+
+    #[cfg(not(any(cfail1, cfail4)))]
+    pub fn inlined_fn() -> u32 {
+        1234
+    }
+}
+
+pub mod bar {
+    use foo::inlined_fn;
+
+    pub fn caller() -> u32 {
+        inlined_fn()
+    }
+}
diff --git a/src/test/incremental/thinlto/independent_cgus_dont_affect_each_other.rs b/tests/incremental/thinlto/independent_cgus_dont_affect_each_other.rs
index 045f20119..045f20119 100644
--- a/src/test/incremental/thinlto/independent_cgus_dont_affect_each_other.rs
+++ b/tests/incremental/thinlto/independent_cgus_dont_affect_each_other.rs
diff --git a/src/test/incremental/type_alias_cross_crate/auxiliary/a.rs b/tests/incremental/type_alias_cross_crate/auxiliary/a.rs
index 61fe297d7..61fe297d7 100644
--- a/src/test/incremental/type_alias_cross_crate/auxiliary/a.rs
+++ b/tests/incremental/type_alias_cross_crate/auxiliary/a.rs
diff --git a/src/test/incremental/type_alias_cross_crate/b.rs b/tests/incremental/type_alias_cross_crate/b.rs
index f6c252684..f6c252684 100644
--- a/src/test/incremental/type_alias_cross_crate/b.rs
+++ b/tests/incremental/type_alias_cross_crate/b.rs
diff --git a/src/test/incremental/unchecked_dirty_clean.rs b/tests/incremental/unchecked_dirty_clean.rs
index 3c8692a30..3c8692a30 100644
--- a/src/test/incremental/unchecked_dirty_clean.rs
+++ b/tests/incremental/unchecked_dirty_clean.rs
diff --git a/src/test/incremental/warnings-reemitted.rs b/tests/incremental/warnings-reemitted.rs
index 0e6b88232..0e6b88232 100644
--- a/src/test/incremental/warnings-reemitted.rs
+++ b/tests/incremental/warnings-reemitted.rs