Refactor hir::Place #17
Conversation
|
If you want commit-by-commit split: https://github.com/sexxi-goose/rust/tree/distinguish_place_and_placewithhirid |
arora-aman
force-pushed
the
init_place_refactor
branch
from
35607b6
to
e0c35f5
Compare
For the following code ```rust let c = || bar(foo.x, foo.x) ``` We generate two different `hir::Place`s for both `foo.x`. Handling this adds overhead for analysis we need to do for RFC 2229. We also want to store type information at each Projection to support analysis as part of the RFC. This resembles what we have for `mir::Place` This commit modifies the Place as follows: - Rename to `PlaceWithHirId`, where there `hir_id` is that of the expressioin. - Move any other information that describes the access out to another struct now called `Place`. - Removed `Span`, it can be accessed using the [hir API](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/hir/map/struct.Map.html#method.span) - Modify `Projection` to be a strucutre of its own, that currently only contains the `ProjectionKind`. Adding type information to projections wil be completed as part of rust-lang/project-rfc-2229#5 Closes rust-lang/project-rfc-2229#3 Co-authored-by: Aman Arora <me@aman-arora.com> Co-authored-by: Roxane Fruytier <roxane.fruytier@hotmail.com>
arora-aman
force-pushed
the
init_place_refactor
branch
from
e0c35f5
to
3659406
Compare
|
🏃♂️ Start running build job, job id: 0d9bab45-33fe-4925-bc31-0af9c2021ec2 |
|
rebase made tests fail locally, looking into it |
| @@ -439,7 +439,10 @@ impl<'a, 'tcx> RegionCtxt<'a, 'tcx> { | |||
|
|
|||
| /// Invoked on any adjustments that occur. Checks that if this is a region pointer being | |||
| /// dereferenced, the lifetime of the pointer includes the deref expr. | |||
| fn constrain_adjustments(&mut self, expr: &hir::Expr<'_>) -> mc::McResult<mc::Place<'tcx>> { | |||
| fn constrain_adjustments( | |||
There was a problem hiding this comment.
./x.py fmt I don't question it :p
| base: PlaceBase::Local(var_id), | ||
| projections: Vec::new(), | ||
| }) | ||
| Ok(PlaceWithHirId::new(hir_id, expr_ty, PlaceBase::Local(var_id), Vec::new())) |
There was a problem hiding this comment.
i think i like how this was laid out previously
There was a problem hiding this comment.
oh wait this is a change to a constructor from the previous syntax, okay should probably leave as is then
There was a problem hiding this comment.
Yeah most of the parameters not go to the member place within PlaceWithHirId
|
✅ Job Completed, access build log here |
Looks like a local setup issue. |
| /// A dereference of a pointer, reference or `Box<T>` of the given type | ||
| Deref(Ty<'tcx>), | ||
| /// An index or a field | ||
| Other, | ||
| } | ||
|
|
||
| #[derive(Clone, Debug)] | ||
| pub struct Projection<'tcx> { |
There was a problem hiding this comment.
I thought we also wanted to introduce ty in the Projection structure (https://github.com/rust-lang/project-rfc-2229/blob/master/hir-place-target.md). Is that not the case anymore or will this change be introduced in a later PR?
There was a problem hiding this comment.
That is part rust-lang/project-rfc-2229#5
There was a problem hiding this comment.
If we do that here, would've have to make sure at each step the type information gets read and put in place. Keeps this PR very focused and allows us to still do more work in parallel later on.
I think after this gets merged we can parallely work on:
There was a problem hiding this comment.
Sounds good, just wanted to confirm. Since I worked on this PR too, I'll let someone else approve it :)
There was a problem hiding this comment.
That's why I assigned this to @ChrisPardy and @null-sleep, since they attended the meeting about the refactor but @sexxi-goose/rustaceans feel free to approve it :)
We only need the Place part to do most of our analysis about captures, so we want to separate that information out. PlaceWithHirId is good for error reporting because it contains the expression's id that lets us access the span. |
|
lol wait can sexxi-bot review and/or approve PRs? because it has been requested |
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.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This is a combination of 18 commits. Commit #2: Additional examples and some small improvements. Commit #3: fixed mir-opt non-mir extensions and spanview title elements Corrected a fairly recent assumption in runtest.rs that all MIR dump files end in .mir. (It was appending .mir to the graphviz .dot and spanview .html file names when generating blessed output files. That also left outdated files in the baseline alongside the files with the incorrect names, which I've now removed.) Updated spanview HTML title elements to match their content, replacing a hardcoded and incorrect name that was left in accidentally when originally submitted. Commit #4: added more test examples also improved Makefiles with support for non-zero exit status and to force validation of tests unless a specific test overrides it with a specific comment. Commit #5: Fixed rare issues after testing on real-world crate Commit #6: Addressed PR feedback, and removed temporary -Zexperimental-coverage -Zinstrument-coverage once again supports the latest capabilities of LLVM instrprof coverage instrumentation. Also fixed a bug in spanview. Commit #7: Fix closure handling, add tests for closures and inner items And cleaned up other tests for consistency, and to make it more clear where spans start/end by breaking up lines. Commit #8: renamed "typical" test results "expected" Now that the `llvm-cov show` tests are improved to normally expect matching actuals, and to allow individual tests to override that expectation. Commit #9: test coverage of inline generic struct function Commit #10: Addressed review feedback * Removed unnecessary Unreachable filter. * Replaced a match wildcard with remining variants. * Added more comments to help clarify the role of successors() in the CFG traversal Commit #11: refactoring based on feedback * refactored `fn coverage_spans()`. * changed the way I expand an empty coverage span to improve performance * fixed a typo that I had accidently left in, in visit.rs Commit #12: Optimized use of SourceMap and SourceFile Commit rust-lang#13: Fixed a regression, and synched with upstream Some generated test file names changed due to some new change upstream. Commit #14: Stripping out crate disambiguators from demangled names These can vary depending on the test platform. Commit #15: Ignore llvm-cov show diff on test with generics, expand IO error message Tests with generics produce llvm-cov show results with demangled names that can include an unstable "crate disambiguator" (hex value). The value changes when run in the Rust CI Windows environment. I added a sed filter to strip them out (in a prior commit), but sed also appears to fail in the same environment. Until I can figure out a workaround, I'm just going to ignore this specific test result. I added a FIXME to follow up later, but it's not that critical. I also saw an error with Windows GNU, but the IO error did not specify a path for the directory or file that triggered the error. I updated the error messages to provide more info for next, time but also noticed some other tests with similar steps did not fail. Looks spurious. Commit #16: Modify rust-demangler to strip disambiguators by default Commit #17: Remove std::process::exit from coverage tests Due to Issue rust-lang#77553, programs that call std::process::exit() do not generate coverage results on Windows MSVC. Commit #18: fix: test file paths exceeding Windows max path len
For the following code
We generate two different
hir::Places for bothfoo.x.Handling this adds overhead for analysis we need to do for RFC 2229.
We also want to store type information at each Projection to support
analysis as part of the RFC. This resembles what we have for
mir::PlaceThis commit modifies the Place as follows:
PlaceWithHirId, where therehir_idis that of theexpressioin.
struct now called
Place.Span, it can be accessed using the hirAPI
Projectionto be a strucutre of its own, that currently onlycontains the
ProjectionKind.Adding type information to projections wil be completed as part of Store Type Information within projections rust-lang/project-rfc-2229#5
Closes rust-lang/project-rfc-2229#3