TyCtxt::get_attr should check that no duplicates are allowed #100658

chenyukang · 2022-08-17T03:48:31Z

Fixes #100631

rust-highfive · 2022-08-17T03:48:34Z

r? @compiler-errors

(rust-highfive has picked a reviewer for you, use r? to override)

compiler-errors · 2022-08-17T03:49:25Z

r? @lcnr

chenyukang · 2022-08-17T03:50:04Z

r? @lcnr
Not sure we need to check any other parts.
I tested with UI, not assertion crash will be triggered.

lcnr · 2022-08-17T08:00:54Z

compiler/rustc_middle/src/ty/mod.rs

+            let mut attrs = self.get_attrs(did, attr);
+            let first = attrs.next();
+            if attrs.next().is_some() {
+                bug!("get_attr: multiple attributes with same attr symbol");
+            }
+            first


we can't check whether there are multiple attributes, but instead have to check that we only use get_attr in cases where the compiler can reasonably deal with multiple attributes.

e.g. the following would ICE with your change (please add that as a test)

#[repr(C)] #[repr(C)] enum Foo {} fn main() {}

instead check - similar to is_builtin_only_local - whether the feature definition in rustc_feature either warns or errors on duplicate attributes. This might not be enough as there could be some attributes where duplicates are allowed, but useless, but that's a bridge we can burn when we get to it.

got it, I will dig more and ping you if I need help.

We should check:

pub enum AttributeDuplicates { #[default] DuplicatesOk ... }

rust/compiler/rustc_feature/src/builtin_attrs.rs

Line 101 in 8556e66

pub enum AttributeDuplicates {

If the attribute is marked as DuplicatesOk WarnFollowing, or WarnFollowingWordOnly, then we allow multiple attributes, otherwise raise an error?

We have a check for proper diagnostics,

rust/compiler/rustc_passes/src/check_attr.rs

Line 2223 in e1b28cd

ErrorFollowing | ErrorPreceding => match seen.entry(attr.name_or_empty()) {

If the attribute is marked as DuplicatesOk WarnFollowing, or WarnFollowingWordOnly, then we allow multiple attributes, otherwise raise an error?

The other way around. We should only use get_attr for attributes which are either WarnFollowing, ErrorFollowing, ErrorPreceding, FutureWarnFollowing and FutureWarnPreceding. For all other attributes using get_attr is a compiler bug so we should ICE there. We should not emit errors for users in get_attr.

@lcnr Code updated and added a testcase.

lcnr

some nits, then r=me

thanks 👍

compiler/rustc_feature/src/builtin_attrs.rs

compiler/rustc_middle/src/ty/mod.rs

src/test/ui/issues/issue-100631.rs

chenyukang · 2022-08-20T23:59:00Z

r=@lcnr

compiler-errors · 2022-08-21T00:00:48Z

@bors r=lcnr

bors · 2022-08-21T00:00:50Z

📌 Commit 5e8b356775549c66eec8cd31dcde60576268d766 has been approved by lcnr

It is now in the queue for this repository.

bors · 2022-08-30T11:57:44Z

@chenyukang: 🔑 Insufficient privileges: Not in reviewers

chenyukang · 2022-08-30T11:59:19Z

r? @lcnr

lcnr · 2022-09-05T08:20:41Z

@bors r+ rollup

bors · 2022-09-05T08:20:43Z

📌 Commit 7d45a75 has been approved by lcnr

It is now in the queue for this repository.

…r=lcnr TyCtxt::get_attr should check that no duplicates are allowed Fixes rust-lang#100631

JohnTitor · 2022-09-05T23:35:48Z

Failed on rollup: #101463 (comment)
This needs a rebase and to move the test outside of src/test/ui/issues.

@bors r-

chenyukang · 2022-09-06T02:44:19Z

Failed on rollup: #101463 (comment) This needs a rebase and to move the test outside of src/test/ui/issues.

@bors r-

Rebase and updated.
Out of curious, why we would want to limit the file number in src/test/ui/issues?

src/test/ui/typeck/issue-100631.rs

lcnr · 2022-09-06T05:29:23Z

Out of curious, why we would want to limit the file number in src/test/ui/issues?

because large directories are difficult to navigate, both in editors and in the github view. E.g. https://github.com/rust-lang/rust/tree/master/src/test/ui/issues currently does not show 1146 entries, which is a annoying for people manually searching for a file

@bors delegate+

(after fixing the nit you can run @bors r=lcnr)

bors · 2022-09-06T05:29:25Z

✌️ @chenyukang can now approve this pull request

bors · 2022-09-06T05:29:26Z

📌 Commit 575e9b6414f9986f5dcdfbfc06356d554636aa86 has been approved by lcnr)`

It is now in the queue for this repository.

lcnr · 2022-09-06T05:29:40Z

woops
@bors r-

chenyukang · 2022-09-06T06:24:08Z

@bors r=lcnr

bors · 2022-09-06T06:24:10Z

📌 Commit 00b10a5 has been approved by lcnr

It is now in the queue for this repository.

compiler-errors · 2022-09-06T06:27:09Z

(side-note @chenyukang it's usually best to wait until CI is green until approving a PR, just in case it fails!)

Rollup of 5 pull requests Successful merges: - rust-lang#100658 (TyCtxt::get_attr should check that no duplicates are allowed) - rust-lang#101021 (Migrate ``rustc_middle`` diagnostic) - rust-lang#101287 (Document eager evaluation of `bool::then_some` argument) - rust-lang#101412 (Some more cleanup in `core`) - rust-lang#101427 (Fix ICE, generalize 'move generics to trait' suggestion for >0 non-rcvr arguments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 17, 2022

rust-highfive assigned compiler-errors Aug 17, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 17, 2022

rust-highfive assigned lcnr and unassigned compiler-errors Aug 17, 2022

lcnr reviewed Aug 17, 2022

View reviewed changes

chenyukang force-pushed the 100631-check-get-attr branch from 1364dcb to 7ec7edd Compare August 20, 2022 14:30

lcnr reviewed Aug 20, 2022

View reviewed changes

compiler/rustc_feature/src/builtin_attrs.rs Outdated Show resolved Hide resolved

compiler/rustc_middle/src/ty/mod.rs Outdated Show resolved Hide resolved

src/test/ui/issues/issue-100631.rs Outdated Show resolved Hide resolved

chenyukang force-pushed the 100631-check-get-attr branch from 7ec7edd to 5e8b356 Compare August 20, 2022 23:55

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 21, 2022

This comment has been minimized.

Sign in to view

chenyukang force-pushed the 100631-check-get-attr branch from 5e8b356 to 7d45a75 Compare August 21, 2022 00:43

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 5, 2022

Rollup merge of rust-lang#100658 - chenyukang:100631-check-get-attr, …

96704a6

…r=lcnr TyCtxt::get_attr should check that no duplicates are allowed Fixes rust-lang#100631

matthiaskrgr mentioned this pull request Sep 5, 2022

Rollup of 6 pull requests #101452

Closed

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Sep 5, 2022

Rollup merge of rust-lang#100658 - chenyukang:100631-check-get-attr, …

d4e12d6

…r=lcnr TyCtxt::get_attr should check that no duplicates are allowed Fixes rust-lang#100631

JohnTitor mentioned this pull request Sep 5, 2022

Rollup of 8 pull requests #101463

Closed

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 5, 2022

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 5, 2022

chenyukang force-pushed the 100631-check-get-attr branch from 7d45a75 to 575e9b6 Compare September 6, 2022 02:37

lcnr reviewed Sep 6, 2022

View reviewed changes

src/test/ui/typeck/issue-100631.rs Outdated Show resolved Hide resolved

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 6, 2022

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 6, 2022

get_attr should check that no duplicates are allowed

00b10a5

chenyukang force-pushed the 100631-check-get-attr branch from 575e9b6 to 00b10a5 Compare September 6, 2022 06:17

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 6, 2022

Dylan-DPC mentioned this pull request Sep 6, 2022

Rollup of 5 pull requests #101479

Merged

bors merged commit 3f22020 into rust-lang:master Sep 6, 2022

rustbot added this to the 1.65.0 milestone Sep 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TyCtxt::get_attr should check that no duplicates are allowed #100658

TyCtxt::get_attr should check that no duplicates are allowed #100658

chenyukang commented Aug 17, 2022

rust-highfive commented Aug 17, 2022

compiler-errors commented Aug 17, 2022

chenyukang commented Aug 17, 2022

lcnr Aug 17, 2022 •

edited

Loading

chenyukang Aug 17, 2022

chenyukang Aug 20, 2022

chenyukang Aug 20, 2022

lcnr Aug 20, 2022

chenyukang Aug 20, 2022

lcnr left a comment

chenyukang commented Aug 20, 2022

compiler-errors commented Aug 21, 2022

bors commented Aug 21, 2022

This comment has been minimized.

bors commented Aug 30, 2022

chenyukang commented Aug 30, 2022

lcnr commented Sep 5, 2022

bors commented Sep 5, 2022

JohnTitor commented Sep 5, 2022

chenyukang commented Sep 6, 2022

lcnr commented Sep 6, 2022

bors commented Sep 6, 2022

bors commented Sep 6, 2022

lcnr commented Sep 6, 2022

chenyukang commented Sep 6, 2022

bors commented Sep 6, 2022

compiler-errors commented Sep 6, 2022

TyCtxt::get_attr should check that no duplicates are allowed #100658

TyCtxt::get_attr should check that no duplicates are allowed #100658

Conversation

chenyukang commented Aug 17, 2022

rust-highfive commented Aug 17, 2022

compiler-errors commented Aug 17, 2022

chenyukang commented Aug 17, 2022

lcnr Aug 17, 2022 • edited Loading

Choose a reason for hiding this comment

chenyukang Aug 17, 2022

Choose a reason for hiding this comment

chenyukang Aug 20, 2022

Choose a reason for hiding this comment

chenyukang Aug 20, 2022

Choose a reason for hiding this comment

lcnr Aug 20, 2022

Choose a reason for hiding this comment

chenyukang Aug 20, 2022

Choose a reason for hiding this comment

lcnr left a comment

Choose a reason for hiding this comment

chenyukang commented Aug 20, 2022

compiler-errors commented Aug 21, 2022

bors commented Aug 21, 2022

This comment has been minimized.

bors commented Aug 30, 2022

chenyukang commented Aug 30, 2022

lcnr commented Sep 5, 2022

bors commented Sep 5, 2022

JohnTitor commented Sep 5, 2022

chenyukang commented Sep 6, 2022

lcnr commented Sep 6, 2022

bors commented Sep 6, 2022

bors commented Sep 6, 2022

lcnr commented Sep 6, 2022

chenyukang commented Sep 6, 2022

bors commented Sep 6, 2022

compiler-errors commented Sep 6, 2022

lcnr Aug 17, 2022 •

edited

Loading