Add a raw "address of" operator by matthewjasper · Pull Request #64588 · rust-lang/rust

matthewjasper · 2019-09-18T20:48:59Z

Parse and feature gate &raw [const | mut] expr (feature gate name is raw_address_of)
Add mir::Rvalue::AddressOf
Use the new Rvalue for:
- the new syntax
- reference to pointer casts
- drop shims for slices and arrays
Stop using mir::Rvalue::Cast with a reference as the operand
Correctly evaluate mir::Rvalue::{Ref, AddressOf} in constant propagation

cc @Centril @RalfJung @oli-obk @eddyb
cc #64490

src/librustc/hir/mod.rs

src/librustc/mir/mod.rs

src/librustc/mir/visit.rs

Centril · 2019-09-18T21:57:46Z

src/librustc_mir/transform/qualify_consts.rs

cc @ecstatic-morse @oli-obk re. the qualification code.

Yea I think none of it should be changed and we should just treat raw borrows as unpromotable (because any potentially promotable things had to error out before)

src/librustc_mir/hair/mod.rs

src/librustc_mir/borrow_check/mod.rs

src/librustc_codegen_ssa/mir/rvalue.rs

src/test/ui/packed/packed-struct-address-of-element.rs

Centril · 2019-09-18T22:37:29Z

Thanks for the PR. I've made an initial review above ^--- (but Ralf should also review this).

Some more remarks on the PR description:

Use the new Rvalue for:

reference to pointer casts

This is not part of the RFC and should remain UB.

drop shims for slices and arrays

Can you elaborate on this please? Is this a spec change or just internal refactoring?

Stop using mir::Rvalue::Cast with a reference as the operand

Seems like the same as &x as *const _ using Rvalue::AddrOf (i.e. not part of the RFC).

Can you please also extend the unused_parens lint to handle &raw [const|mut] $place_expr?

ecstatic-morse · 2019-09-19T17:05:12Z

@matthewjasper You need to handle Rvalue::AddressOf(_, _) here and here as well. This is the part of the code that forbids taking &mut references in const bodies. We need to forbid anything that allows mutation through indirection, since that can cause an Option<NeedsDropType> to go from None to Some.

matthewjasper · 2019-09-19T20:15:03Z

This is not part of the RFC and should remain UB.

What should be UB? &x as *const _ still is and x as *const _ could never cause UB.

Can you elaborate on this please? Is this a spec change or just internal refactoring?

It's a refactoring. If the precise stacked borrows effects of slice/array drop shims is defined, then maybe it's a change, but not a very big one since the parameter is a mutable reference, and the calls to drop the elements create mutable references.

Can you please also extend the unused_parens lint to handle &raw [const|mut] $place_expr?

This can be a follow up. The (lack of) behavior here is consistent with & AFAICT.

Centril · 2019-09-19T20:28:36Z

What should be UB? &x as *const _ still is and x as *const _ could never cause UB.

Oh I see; seems I misread. Can you add a mir-opt test to that effect?

This can be a follow up. The (lack of) behavior here is consistent with & AFAICT.

Sure, can you add a ticket to the tracking issue when this PR is merged?

ecstatic-morse · 2019-09-29T23:19:14Z

@matthewjasper @RalfJung Some tests need to be added to ensure that &raw mut is forbidden in const contexts. Also, there's now two validation passes (one uses dataflow to support #49146) that are checked against one another for compatibility. Once &raw mut references are handled, I'm happy to port the changes to the new validator in librustc_mir/transform/check_consts/validation.rs.

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

@petrochenkov

syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov

This operator creates a raw pointer to a Place directly, without first creating a reference. See RFC rust-lang#2582 for motivation. The Rvalue is currently unused.

`hir::BorrowKind::Raw` borrows and casting a reference to a raw pointer no longer do a reborrow followed by a cast. Instead we dereference and take the address.

matthewjasper · 2019-12-19T13:01:32Z

@bors r=oli-obk

bors · 2019-12-19T13:01:34Z

📌 Commit a749116 has been approved by oli-obk

RalfJung · 2019-12-21T12:01:34Z

This is awesome, thanks so much. :)

RalfJung · 2019-12-21T12:03:43Z

src/librustc_mir/transform/add_retag.rs

+                    // Retag-as-raw after escaping to a raw pointer.
+                    StatementKind::Assign(box (ref place, Rvalue::AddressOf(..))) => {
+                        (RetagKind::Raw, place.clone())
                    }


So this is doing that for all &raw now, right? Certainly a reasonable start, though it doesn't seem to be entirely equivalent to the previous operation which also made sure that the "input" is a reference.

There wasn't any way to write &raw const *x where x is a raw pointer before.

rust-highfive assigned cramertj Sep 18, 2019

This comment has been minimized.

Sign in to view

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 18, 2019

matthewjasper force-pushed the mir-address-of branch from c6f4a9e to 1f210d6 Compare September 18, 2019 20:58

This comment has been minimized.

Sign in to view

Centril reviewed Sep 18, 2019

View reviewed changes

This comment has been minimized.

Sign in to view

rust-highfive assigned RalfJung and unassigned cramertj Sep 18, 2019

This comment has been minimized.

Sign in to view

Centril added the F-raw_ref_op `#![feature(raw_ref_op)]` label Sep 19, 2019

Centril mentioned this pull request Sep 19, 2019

RFC for an operator to take a raw reference rust-lang/rfcs#2582

Merged

This comment has been minimized.

Sign in to view

Centril mentioned this pull request Sep 30, 2019

syntax: cleanup param, method, and misc parsing #64910

Merged

matthewjasper added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 30, 2019

This comment has been minimized.

Sign in to view

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

This comment has been minimized.

Sign in to view

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 Dec 16, 2019

Mark-Simulacrum mentioned this pull request Dec 18, 2019

Rollup of 7 pull requests #67384

Closed

This comment has been minimized.

Sign in to view

matthewjasper added 8 commits December 18, 2019 20:09

Add Rvalue::AddressOf to MIR

3a19fbf

This operator creates a raw pointer to a Place directly, without first creating a reference. See RFC rust-lang#2582 for motivation. The Rvalue is currently unused.

Start generating AddressOf rvalues in MIR

35919ac

`hir::BorrowKind::Raw` borrows and casting a reference to a raw pointer no longer do a reborrow followed by a cast. Instead we dereference and take the address.

Make slice drop shims use AddressOf

5fb797c

Add mir opt test for AddressOf

7081c79

Check const-propagation of borrows of unsized places

7b0cc6a

Update test now that reference to pointer casts have more checks

1593194

Add more tests for raw_ref_op

6dcc789

Fix comment ordering

a749116

This comment has been minimized.

Sign in to view

This was referenced Dec 20, 2019

Rollup of 6 pull requests #67451

Closed

Rollup of 5 pull requests #67455

Merged

This comment has been minimized.

Sign in to view

RalfJung mentioned this pull request Dec 21, 2019

Rustup to rustc 1.42.0-nightly (9ff30a781 2019-12-21) rust-lang/miri#1117

Merged

RalfJung reviewed Dec 21, 2019

View reviewed changes

efenniht mentioned this pull request Dec 26, 2019

offset_of! is not working for {nested fields, type paths} kaist-cp/hafnium-verification#40

Open

RalfJung mentioned this pull request Jan 30, 2020

Test raw-ptr-cast without reborrow rust-lang/miri#1163

Merged

RalfJung mentioned this pull request Jul 27, 2020

Tracking Issue for raw_ref_macros #73394

Closed

3 tasks

Uh oh!

Conversation

matthewjasper commented Sep 18, 2019

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Centril Sep 18, 2019

Choose a reason for hiding this comment

Uh oh!

oli-obk Oct 10, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Centril commented Sep 18, 2019

Uh oh!

ecstatic-morse commented Sep 19, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matthewjasper commented Sep 19, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Centril commented Sep 19, 2019

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ecstatic-morse commented Sep 29, 2019

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

matthewjasper commented Dec 19, 2019

Uh oh!

bors commented Dec 19, 2019

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

RalfJung commented Dec 21, 2019

Uh oh!

RalfJung Dec 21, 2019

Choose a reason for hiding this comment

Uh oh!

matthewjasper Dec 21, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!

ecstatic-morse commented Sep 19, 2019 •

edited

Loading

matthewjasper commented Sep 19, 2019 •

edited

Loading