bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #111062 - clubby789:invalid-repr-unchecked, r=petrochenkov

Browse source 
Don't bail out early when checking invalid `repr` attr

Fixes #111051

An invalid repr delays a bug. If there are other invalid attributes on the item, we emit a warning and exit without re-checking the repr here, so no error is emitted and the delayed bug ICEs
This commit is contained in:
Dylan DPC 2023-05-04 00:17:25 +05:30 • committed by GitHub
commit fce0741fe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_passes/src/check_attr.rs
View file

@ -101,12 +101,11 @@ impl CheckAttrVisitor<'_> {
item: Option<ItemLike<'_>>,
) {
let mut doc_aliases = FxHashMap::default();
let mut is_valid = true;
let mut specified_inline = None;
let mut seen = FxHashMap::default();
let attrs = self.tcx.hir().attrs(hir_id);
for attr in attrs {
let attr_is_valid = match attr.name_or_empty() {
match attr.name_or_empty() {
sym::do_not_recommend => self.check_do_not_recommend(attr.span, target),
sym::inline => self.check_inline(hir_id, attr, span, target),
sym::no_coverage => self.check_no_coverage(hir_id, attr, span, target),
@ -188,7 +187,6 @@ impl CheckAttrVisitor<'_> {
sym::link_ordinal => self.check_link_ordinal(&attr, span, target),
_ => true,
};
is_valid &= attr_is_valid;
// lint-only checks
match attr.name_or_empty() {
@ -255,10 +253,6 @@ impl CheckAttrVisitor<'_> {
self.check_unused_attribute(hir_id, attr)
}
if !is_valid {
return;
}
self.check_repr(attrs, span, target, item, hir_id);
self.check_used(attrs, target);
}