Skip to content

Commit

Permalink
Err if the debugging options are not passed.
Browse files Browse the repository at this point in the history
  • Loading branch information
cjgillot committed Mar 22, 2021
1 parent 219603a commit 1aad7e7
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 1 deletion.
19 changes: 19 additions & 0 deletions compiler/rustc_passes/src/check_attr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ impl CheckAttrVisitor<'tcx> {
self.check_naked(hir_id, attr, span, target)
} else if self.tcx.sess.check_name(attr, sym::rustc_legacy_const_generics) {
self.check_rustc_legacy_const_generics(&attr, span, target, item)
} else if self.tcx.sess.check_name(attr, sym::rustc_clean)
|| self.tcx.sess.check_name(attr, sym::rustc_dirty)
|| self.tcx.sess.check_name(attr, sym::rustc_if_this_changed)
|| self.tcx.sess.check_name(attr, sym::rustc_then_this_would_need)
{
self.check_rustc_dirty_clean(&attr)
} else {
// lint-only checks
if self.tcx.sess.check_name(attr, sym::cold) {
Expand Down Expand Up @@ -1012,6 +1018,19 @@ impl CheckAttrVisitor<'tcx> {
}
}

/// Checks if `#[rustc_legacy_const_generics]` is applied to a function and has a valid argument.
fn check_rustc_dirty_clean(&self, attr: &Attribute) -> bool {
if self.tcx.sess.opts.debugging_opts.query_dep_graph {
true
} else {
self.tcx
.sess
.struct_span_err(attr.span, "attribute requires -Z query-dep-graph to be enabled")
.emit();
false
}
}

/// Checks if `#[link_section]` is applied to a function or static.
fn check_link_section(&self, hir_id: HirId, attr: &Attribute, span: &Span, target: Target) {
match target {
Expand Down
1 change: 1 addition & 0 deletions src/test/incremental/ich_nested_items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

// revisions: cfail1 cfail2
// build-pass (FIXME(62277): could be check-pass?)
// compile-flags: -Z query-dep-graph

#![crate_type = "rlib"]
#![feature(rustc_attrs)]
Expand Down
1 change: 1 addition & 0 deletions src/test/incremental/ich_resolve_results.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// `use` to something different.

// revisions: rpass1 rpass2 rpass3
// compile-flags: -Z query-dep-graph

#![feature(rustc_attrs)]

Expand Down
2 changes: 1 addition & 1 deletion src/test/incremental/spans_significant_w_panic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// revisions:rpass1 rpass2

// compile-flags: -C overflow-checks=on
// compile-flags: -C overflow-checks=on -Z query-dep-graph

#![feature(rustc_attrs)]

Expand Down
20 changes: 20 additions & 0 deletions src/test/ui/dep-graph/dep-graph-check-attr.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Test that using rustc_clean/dirty/if_this_changed/then_this_would_need
// are forbidden when `-Z query-dep-graph` is not enabled.

#![feature(rustc_attrs)]
#![allow(dead_code)]
#![allow(unused_variables)]

#[rustc_dirty(hir_owner)] //~ ERROR attribute requires -Z query-dep-graph
fn main() {}

#[rustc_if_this_changed(hir_owner)] //~ ERROR attribute requires -Z query-dep-graph
struct Foo<T> {
f: T,
}

#[rustc_clean(hir_owner)] //~ ERROR attribute requires -Z query-dep-graph
type TypeAlias<T> = Foo<T>;

#[rustc_then_this_would_need(variances_of)] //~ ERROR attribute requires -Z query-dep-graph
trait Use<T> {}
26 changes: 26 additions & 0 deletions src/test/ui/dep-graph/dep-graph-check-attr.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
error: attribute requires -Z query-dep-graph to be enabled
--> $DIR/dep-graph-check-attr.rs:8:1
|
LL | #[rustc_dirty(hir_owner)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^

error: attribute requires -Z query-dep-graph to be enabled
--> $DIR/dep-graph-check-attr.rs:11:1
|
LL | #[rustc_if_this_changed(hir_owner)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: attribute requires -Z query-dep-graph to be enabled
--> $DIR/dep-graph-check-attr.rs:16:1
|
LL | #[rustc_clean(hir_owner)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^

error: attribute requires -Z query-dep-graph to be enabled
--> $DIR/dep-graph-check-attr.rs:19:1
|
LL | #[rustc_then_this_would_need(variances_of)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: aborting due to 4 previous errors

0 comments on commit 1aad7e7

Please sign in to comment.