Skip to content

Mark ZST as FFI-safe if all its fields are PhantomData - #106675

Merged
bors merged 1 commit into
rust-lang:masterfrom
krtab:fix_improper_ctypes
Jan 13, 2023
Merged

Mark ZST as FFI-safe if all its fields are PhantomData#106675
bors merged 1 commit into
rust-lang:masterfrom
krtab:fix_improper_ctypes

Conversation

@krtab

@krtabkrtab commented Jan 10, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

This presents one possible solution to issue: #106629.

This is my first (tentative) contribution to the compiler itself.

I'm looking forward for comments and feedback

Closes: #106629

@rustbot

rustbot commented Jan 10, 2023

Copy link
Copy Markdown
Collaborator

r? @davidtwco

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot 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 Jan 10, 2023
@krtab
krtab marked this pull request as draft January 10, 2023 10:48
@krtabkrtab changed the title Draft: Mark ZST as FFI-safe if all its fields are PhantomDataMark ZST as FFI-safe if all its fields are PhantomDataJan 10, 2023
davidtwco
davidtwco requested changes Jan 10, 2023
View reviewed changes

@davidtwcodavidtwco left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is a good start, thanks for the contribution, left some comments below.

Comment threadcompiler/rustc_lint/src/types.rs Outdated
Comment threadcompiler/rustc_lint/src/types.rs Outdated
Comment threadcompiler/rustc_lint/src/types.rs Outdated
@davidtwco

davidtwco commented Jan 10, 2023

Copy link
Copy Markdown
Member

@rustbot author (use @rustbot ready when you want me to look again)

@rustbotrustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 10, 2023
@krtab
krtabforce-pushed the fix_improper_ctypes branch from 0272d23 to 27c5684CompareJanuary 10, 2023 13:52
@krtab

krtab commented Jan 10, 2023

Copy link
Copy Markdown
ContributorAuthor

I think the new version takes into account your points 2 and 3, and I answered 1 above. LMKWYT
@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 10, 2023
@krtab
krtabforce-pushed the fix_improper_ctypes branch from 27c5684 to 50b53caCompareJanuary 10, 2023 15:11
@krtab

krtab commented Jan 10, 2023

Copy link
Copy Markdown
ContributorAuthor

@rustbot ready

@krtab
krtabforce-pushed the fix_improper_ctypes branch from 50b53ca to f5ab431CompareJanuary 10, 2023 15:13
@davidtwco

davidtwco commented Jan 10, 2023

Copy link
Copy Markdown
Member

There's a test failing, after you fix that then I can approve :)

@krtab

krtab commented Jan 10, 2023

Copy link
Copy Markdown
ContributorAuthor

This is a bit above my pay-grade:

The test failing is basically:

#[repr(transparent)]enumTransparentEnum<T>{Variant(T, std::marker::PhantomData<Z>),}

which fails because it is an enum with a PhantomData, triggering this code path
https://github.com/rust-lang/rust/blob/f5ab431cb7bd2dbf2aa50daa187c8e53ba1419f8/compiler/rustc_lint/src/types.rs#L901-L907

I'm not sure which one is the correct behavior. Should it have been considered not FFI safe since the beginning, or is this PR introducing a new false positive?

@krtab

krtab commented Jan 10, 2023

Copy link
Copy Markdown
ContributorAuthor

I've pushed a fix for the failing test but I'll leave it to you to decide which is the correct behavior.

@rustbot ready

davidtwco
davidtwco reviewed Jan 11, 2023
View reviewed changes
Comment threadcompiler/rustc_lint/src/types.rs Outdated
@krtab

krtab commented Jan 11, 2023•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

It this is ok for you, I guess all is left is for me to squash that into a single commit and mark the PR as not draft.

@davidtwco

davidtwco commented Jan 11, 2023

Copy link
Copy Markdown
Member

It this is ok for you, I guess all is left is for me to squash that into a single commit and mark the PR as not draft.

Works for me :)

@krtab
krtabforce-pushed the fix_improper_ctypes branch from 1722028 to 574a31fCompareJanuary 11, 2023 15:46
@krtab
krtab marked this pull request as ready for review January 11, 2023 15:46
@krtab

krtab commented Jan 11, 2023

Copy link
Copy Markdown
ContributorAuthor

Looks like we're good to go!
Thanks a lot for the reviewing work, and cheers to my first contribution to rustc! 🥳

@davidtwco

davidtwco commented Jan 12, 2023

Copy link
Copy Markdown
Member

In fact, one last thing, can you add a test case for #106629?

@krtab
krtabforce-pushed the fix_improper_ctypes branch from 574a31f to 27a4e17CompareJanuary 12, 2023 10:44
@krtab

krtab commented Jan 12, 2023

Copy link
Copy Markdown
ContributorAuthor

My bad, I also forgot to do it!
Should be ok now.

@davidtwco

davidtwco commented Jan 12, 2023

Copy link
Copy Markdown
Member

My bad, I also forgot to do it! Should be ok now.

Tests were moved from src/test to tests/ recently, can you rebase and change it to that? CI will fail otherwise.

@krtab
Mark ZST as FFI-safe if all its fields are PhantomData
797f247
Modify the linting behavior and add the corresponding
regression test
@krtab
krtabforce-pushed the fix_improper_ctypes branch from 27a4e17 to 797f247CompareJanuary 12, 2023 12:43
@davidtwco

davidtwco commented Jan 12, 2023

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 12, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 797f247 has been approved by davidtwco

It is now in the queue for this repository.

@borsbors 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 Jan 12, 2023
@JohnTitorJohnTitor mentioned this pull request Jan 12, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 12, 2023
@bors
Auto merge ofrust-lang#106786- JohnTitor:rollup-8f4vk8m, r=JohnTitor
86ad69d
Rollup of 8 pull requests
Successful merges:
- rust-lang#105795 (Stabilize `abi_efiapi` feature)
- rust-lang#106446 ([LSDA] Take ttype_index into account when taking unwind action)
- rust-lang#106675 (Mark ZST as FFI-safe if all its fields are PhantomData)
- rust-lang#106740 (Adding a hint on iterator type errors)
- rust-lang#106741 (Fix reexport of `doc(hidden)` item)
- rust-lang#106759 (Revert "Make nested RPITIT inherit the parent opaque's generics.")
- rust-lang#106772 (Re-add mw to review rotation)
- rust-lang#106778 (Exclude formatting commit from blame)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 19ba430 into rust-lang:masterJan 13, 2023
@rustbotrustbot added this to the 1.68.0 milestone Jan 13, 2023
@oxalicaoxalica mentioned this pull request Jul 7, 2023
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@davidtwcodavidtwcodavidtwco approved these changes

Assignees

@davidtwcodavidtwco

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.68.0

Development

Successfully merging this pull request may close these issues.

improper_ctypes lint fires on #[repr(transparent)] wrappers around PhantomData (in struct fields).

4 participants

@krtab@rustbot@davidtwco@bors