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.

Sign up for GitHub

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

Jump to bottom

Make clashing_extern_declarations considering generic args for ADT field #130924

Merged
merged 1 commit into from
Sep 28, 2024
Merged

Make clashing_extern_declarations considering generic args for ADT field #130924

merged 1 commit into from
Sep 28, 2024

Conversation

surechen
Copy link
Contributor

In following example, G should be recognized as different from G :

#[repr(C)] pub struct G<T> { g: [T; 4] }

pub mod x { extern "C" { pub fn g(_: super::G<u16>); } }
pub mod y { extern "C" { pub fn g(_: super::G<u32>); } }

fixes #130851

@rustbot
Copy link
Collaborator

rustbot commented Sep 27, 2024

r? @pnkfelix

rustbot has assigned @pnkfelix.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 27, 2024
compiler-errors
compiler-errors approved these changes Sep 27, 2024
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with this change, but I also fear that this could lead to more stack overflows... This is reachable on nightly, though, so I'm fine to approve this.

@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Sep 27, 2024

📌 Commit 0bf9289 has been approved by compiler-errors

It is now in the queue for this repository.

@bors 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 Sep 27, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 28, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 28, 2024
@bors
Auto merge of rust-lang#130964 - matthiaskrgr:rollup-suriuub, r=matth…
612796c 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#125404 (Fix `read_buf` uses in `std`)
 - rust-lang#130866 (Allow instantiating object trait binder when upcasting)
 - rust-lang#130922 (Reference UNSPECIFIED instead of INADDR_ANY in join_multicast_v4)
 - rust-lang#130924 (Make clashing_extern_declarations considering generic args for ADT field)
 - rust-lang#130939 (rustdoc: update `ProcMacro` docs section on helper attributes)
 - rust-lang#130940 (Revert space-saving operations)
 - rust-lang#130944 (Allow instantiating trait object binder in ptr-to-ptr casts)
 - rust-lang#130953 (Rename a few tests to make tidy happier)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2df6b07 into rust-lang:master Sep 28, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 28, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 28, 2024
@rust-timer
Unrolled build for rust-lang#130924
8b06bb8 
Rollup merge of rust-lang#130924 - surechen:fix_130851, r=compiler-errors

Make clashing_extern_declarations considering generic args for ADT field

In following example, G<u16> should be recognized as different from G<u32> :

```rust
#[repr(C)] pub struct G<T> { g: [T; 4] }

pub mod x { extern "C" { pub fn g(_: super::G<u16>); } }
pub mod y { extern "C" { pub fn g(_: super::G<u32>); } }
```

fixes rust-lang#130851
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@pnkfelix pnkfelix

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.83.0
Development

Successfully merging this pull request may close these issues.

Missing clashing extern declaration warning when using generic data types
5 participants
@surechen @rustbot @compiler-errors @bors @pnkfelix