Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Encode spans relative to the enclosing item -- enable on nightly #84762

Merged
merged 8 commits into from
Jan 2, 2023
Prev Previous commit
Next Next commit
Remove references to removed option from tests.
cjgillot committed Dec 25, 2022

Verified

This commit was signed with the committer’s verified signature.
snyk-bot Snyk bot
commit 5b9360bb1e0ca80831ef80d521aaf0815ea6e303
2 changes: 0 additions & 2 deletions src/test/incremental/change_symbol_export_status.rs
Original file line number Diff line number Diff line change
@@ -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")]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/call_expressions.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/closure_expressions.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/enum_constructors.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/enum_defs.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/exported_vs_not.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/extern_mods.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/for_loops.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/function_interfaces.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/if_expressions.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/indexing_expressions.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/inherent_impls.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/inline_asm.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/let_expressions.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/loop_expressions.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/match_expressions.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/statics.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/struct_constructors.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/struct_defs.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/trait_defs.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/trait_impls.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/unary_and_binary_exprs.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/while_let_loops.rs
Original file line number Diff line number Diff line change
@@ -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)]
3 changes: 0 additions & 3 deletions src/test/incremental/hashes/while_loops.rs
Original file line number Diff line number Diff line change
@@ -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)]
12 changes: 4 additions & 8 deletions src/test/incremental/spans_significant_w_debuginfo.rs
Original file line number Diff line number Diff line change
@@ -1,21 +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 rpass3 rpass4
// revisions:rpass1 rpass2

// ignore-asmjs wasm2js does not support source maps yet
// compile-flags: -g -Z query-dep-graph
// [rpass3]compile-flags: -Zincremental-relative-spans
// [rpass4]compile-flags: -Zincremental-relative-spans

#![feature(rustc_attrs)]
#![rustc_partition_codegened(module = "spans_significant_w_debuginfo", cfg = "rpass2")]
#![rustc_partition_codegened(module = "spans_significant_w_debuginfo", cfg = "rpass4")]

#[cfg(any(rpass1, rpass3))]
#[cfg(rpass1)]
pub fn main() {}

#[cfg(any(rpass2, rpass4))]
#[rustc_clean(except = "hir_owner,hir_owner_nodes,optimized_mir", cfg = "rpass2")]
#[rustc_clean(cfg = "rpass4")]
#[cfg(rpass2)]
#[rustc_clean(cfg = "rpass2")]
pub fn main() {}
12 changes: 4 additions & 8 deletions src/test/incremental/spans_significant_w_panic.rs
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
// 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 rpass3 rpass4
// [rpass3]compile-flags: -Zincremental-relative-spans
// [rpass4]compile-flags: -Zincremental-relative-spans
// 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")]
#![rustc_partition_codegened(module = "spans_significant_w_panic", cfg = "rpass4")]

#[cfg(any(rpass1, rpass3))]
#[cfg(rpass1)]
pub fn main() {
if std::hint::black_box(false) {
panic!()
}
}

#[cfg(any(rpass2, rpass4))]
#[rustc_clean(except = "hir_owner,hir_owner_nodes,optimized_mir", cfg = "rpass2")]
#[rustc_clean(cfg = "rpass4")]
#[cfg(rpass2)]
#[rustc_clean(cfg = "rpass2")]
pub fn main() {
if std::hint::black_box(false) {
panic!()
13 changes: 4 additions & 9 deletions src/test/incremental/string_constant.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// revisions: cfail1 cfail2 cfail3 cfail4
// revisions: cfail1 cfail2
// compile-flags: -Z query-dep-graph
// [cfail3]compile-flags: -Zincremental-relative-spans
// [cfail4]compile-flags: -Zincremental-relative-spans
// build-pass (FIXME(62277): could be check-pass?)

#![allow(warnings)]
@@ -13,14 +11,13 @@
// needed even for callers of `x`.

pub mod x {
#[cfg(any(cfail1, cfail3))]
#[cfg(cfail1)]
pub fn x() {
println!("{}", "1");
}

#[cfg(any(cfail2, cfail4))]
#[rustc_clean(except = "hir_owner,hir_owner_nodes,optimized_mir,promoted_mir", cfg = "cfail2")]
#[rustc_clean(except = "hir_owner_nodes,promoted_mir", cfg = "cfail4")]
#[cfg(cfail2)]
#[rustc_clean(except = "hir_owner_nodes,promoted_mir", cfg = "cfail2")]
pub fn x() {
println!("{}", "2");
}
@@ -30,7 +27,6 @@ pub mod y {
use x;

#[rustc_clean(cfg = "cfail2")]
#[rustc_clean(cfg = "cfail4")]
pub fn y() {
x::x();
}
@@ -40,7 +36,6 @@ pub mod z {
use y;

#[rustc_clean(cfg = "cfail2")]
#[rustc_clean(cfg = "cfail4")]
pub fn z() {
y::y();
}
25 changes: 1 addition & 24 deletions src/test/incremental/thinlto/cgu_keeps_identical_fn.rs
Original file line number Diff line number Diff line change
@@ -3,10 +3,7 @@
// 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 cfail4 cfail5 cfail6
// [cfail4]compile-flags: -Zincremental-relative-spans
// [cfail5]compile-flags: -Zincremental-relative-spans
// [cfail6]compile-flags: -Zincremental-relative-spans
// revisions: cfail1 cfail2 cfail3
// compile-flags: -Z query-dep-graph -O
// build-pass (FIXME(62277): could be check-pass?)

@@ -18,16 +15,6 @@
cfg = "cfail3",
kind = "post-lto"
)]
#![rustc_expected_cgu_reuse(
module = "cgu_keeps_identical_fn-foo",
cfg = "cfail5",
kind = "post-lto"
)]
#![rustc_expected_cgu_reuse(
module = "cgu_keeps_identical_fn-foo",
cfg = "cfail6",
kind = "post-lto"
)]
#![rustc_expected_cgu_reuse(
module = "cgu_keeps_identical_fn-bar",
cfg = "cfail2",
@@ -38,16 +25,6 @@
cfg = "cfail3",
kind = "post-lto"
)]
#![rustc_expected_cgu_reuse(
module = "cgu_keeps_identical_fn-bar",
cfg = "cfail5",
kind = "post-lto"
)]
#![rustc_expected_cgu_reuse(
module = "cgu_keeps_identical_fn-bar",
cfg = "cfail6",
kind = "post-lto"
)]

mod foo {