Skip to content

Introduce the beginning of a THIR unsafety checker - #83129

Merged
bors merged 5 commits into
rust-lang:masterfrom
LeSeulArtichaut:thir-unsafeck
May 13, 2021
Merged

Introduce the beginning of a THIR unsafety checker#83129
bors merged 5 commits into
rust-lang:masterfrom
LeSeulArtichaut:thir-unsafeck

Conversation

@LeSeulArtichaut

@LeSeulArtichautLeSeulArtichaut commented Mar 14, 2021

Copy link
Copy Markdown
Contributor

This poses the foundations for the THIR unsafety checker, so that it can be implemented incrementally:

  • implements a rudimentary Visitor for the THIR (which will definitely need some tweaking in the future)
  • introduces a new -Zthir-unsafeck flag which tells the compiler to use THIR unsafeck instead of MIR unsafeck
  • implements detection of unsafe functions
  • adds revisions to the UI tests to test THIR unsafeck alongside MIR unsafeck

This uses a very simple query design, where bodies are unsafety-checked on a body per body basis. This however has some big flaws:

  • the unsafety-checker builds the THIR itself, which means a lot of work is duplicated with MIR building constructing its own copy of the THIR
  • unsafety-checking closures is currently completely wrong: closures should take into account the "safety context" in which they are created, here we are considering that closures are always a safe context

I had intended to fix these problems in follow-up PRs since they are always gated under the -Zthir-unsafeck flag (which is explicitely noted to be unsound).

r? @nikomatsakis
cc rust-lang/project-thir-unsafeck#3rust-lang/project-thir-unsafeck#7

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 14, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@LeSeulArtichaut

LeSeulArtichaut commented Mar 14, 2021

Copy link
Copy Markdown
ContributorAuthor

Wow, you can't use TODOs in the compiler :D

@LeSeulArtichautLeSeulArtichaut mentioned this pull request Mar 14, 2021
Closed
13 tasks
@bstriebstrie added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 31, 2021
nikomatsakis
nikomatsakis reviewed Apr 1, 2021
View reviewed changes

@nikomatsakisnikomatsakis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ack! Just saw this. Will review Asap =)

nikomatsakis
nikomatsakis requested changes Apr 3, 2021
View reviewed changes

@nikomatsakisnikomatsakis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This looks like a great start! I left a few nits.

Comment threadcompiler/rustc_mir_build/src/check_unsafety.rs Outdated
Comment threadcompiler/rustc_mir_build/src/thir/visit.rs Outdated
@LeSeulArtichaut

LeSeulArtichaut commented Apr 3, 2021•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

I implemented the changes you requested.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
nikomatsakis
nikomatsakis requested changes May 12, 2021
View reviewed changes

@nikomatsakisnikomatsakis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This looks great, @LeSeulArtichaut! See my comment below.

Comment threadcompiler/rustc_interface/src/passes.rs
@nikomatsakisnikomatsakis 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 May 12, 2021
nikomatsakis
nikomatsakis approved these changes May 13, 2021
View reviewed changes

@nikomatsakisnikomatsakis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

My bad! Everything looks good.

@nikomatsakis

nikomatsakis commented May 13, 2021

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented May 13, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 985fb4c has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 13, 2021
@bors

bors commented May 13, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 985fb4c with merge 17b60b8...

@bors

bors commented May 13, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing 17b60b8 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 13, 2021
@bors
bors merged commit 17b60b8 into rust-lang:masterMay 13, 2021
@rustbotrustbot added this to the 1.54.0 milestone May 13, 2021
@syvbsyvb mentioned this pull request May 13, 2021
Merged
@LeSeulArtichaut
LeSeulArtichaut deleted the thir-unsafeck branch May 13, 2021 14:45
@syvbsyvb mentioned this pull request May 13, 2021
Merged
@LeSeulArtichautLeSeulArtichaut mentioned this pull request May 13, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 16, 2021
@bors
Auto merge ofrust-lang#85259- Smittyvb:thir-unsafeck-inline-asm, r=…
6d525d5
…nikomatsakis
Check for inline assembly in THIR unsafeck
rust-lang#83129 was merged recently and added a THIR unsafe checker. This adds a check for inline assembly. (and this is 2x simpler than the MIR version, which has to check for `asm` and `llvm_asm` in two separate spots!)
see also rust-lang/project-thir-unsafeck#7
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 9, 2021
@bors
Auto merge ofrust-lang#85263- Smittyvb:thir-unsafeck-union-field, r…
240ff4c
…=oli-obk
Check for union field accesses in THIR unsafeck
see also rust-lang#85259, rust-lang#83129, rust-lang/project-thir-unsafeck#7
r? `@LeSeulArtichaut`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis approved these changes

Assignees

@nikomatsakisnikomatsakis

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.54.0

Development

Successfully merging this pull request may close these issues.

7 participants

@LeSeulArtichaut@rust-log-analyzer@bors@nikomatsakis@bstrie@rust-highfive@rustbot