Rollup of 8 pull requests by Dylan-DPC · Pull Request #99014 · rust-lang/rust

Dylan-DPC · 2022-07-07T12:36:56Z

Successful merges:

Fix ProjectionElem validation #96856 (Fix ProjectionElem validation)
Improve soundness of rustc_arena #97711 (Improve soundness of rustc_arena)
Finishing touches for #[expect] (RFC 2383) #98507 (Finishing touches for #[expect] (RFC 2383))
rustdoc: Cleanup more FIXMEs #98692 (rustdoc: Cleanup more FIXMEs)
incr: cache dwarf objects in work products #98901 (incr: cache dwarf objects in work products)
Make MIR basic blocks field public #98930 (Make MIR basic blocks field public)
Remove (unused) inherent impl anchors #98973 (Remove (unused) inherent impl anchors)
Edit rustc_mir_dataflow::framework documentation #98981 ( Edit rustc_mir_dataflow::framework documentation )

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Decrease the Ns of bug loops to a smaller N, which makes them a lot faster in miri.

In this case, it seems fine to have the field be the inverse of the flag, especially the `enable` vs `disable` terminology is clear.

Cache DWARF objects alongside object files in work products when those exist so that DWARF object files are available for thorin in packed mode in incremental scenarios. Signed-off-by: David Wood <david.wood@huawei.com>

Compiling with `-Csplit-debuginfo=packed` was leaving behind `.dwo` files because either the metadata or allocator module contained a DWARF object which was not being removed by the `maybe_remove_temps_from_module` closure.

This should have been here from the start... oops. When `thorin` fails to package a DWARF package, that should fail compilation.

There was a problem with storing a `Box<T>` in a struct, where the current rules would invalidate the value. this makes it store a raw pointer instead, circumventing the aliasing problems.

…2383) Examples: NON_ASCII_IDENTS, UNCOMMON_CODEPOINTS, CONFUSABLE_IDENTS, MIXED_SCRIPT_CONFUSABLES

This makes it possible to mutably borrow different fields of the MIR body without resorting to methods like `basic_blocks_local_decls_mut_and_var_debug_info`. To preserve validity of control flow graph caches in the presence of modifications, a new struct `BasicBlocks` wraps together basic blocks and control flow graph caches. The `BasicBlocks` dereferences to `IndexVec<BasicBlock, BasicBlockData>`. On the other hand a mutable access requires explicit `as_mut()` call.

…n, r=Icnr Fix ProjectionElem validation `TypeChecker::visit_projection_elem` was not actually being called.

…iser Improve soundness of rustc_arena Make it runnable in miri by changing the loop iteration count for some tests in miri. Also fix a stacked borrows issue with box.

…n-magic, r=wesleywiser Finishing touches for `#[expect]` (RFC 2383) This PR adds documentation and some functionality to rustc's lint passes, to manually fulfill expectations. This is needed for some lints in Clippy. Hopefully, it should be one of the last things before we can move forward with stabilizing this feature. As part of this PR, I've also updated `clippy::duplicate_mod` to showcase how this new functionality can be used and to ensure that it works correctly. --- changelog: [`duplicate_mod`]: Fixed lint attribute interaction r? `@wesleywiser` cc: rust-lang#97660, rust-lang#85549 And I guess that's it. Here have a magical unicorn 🦄

rustdoc: Cleanup more FIXMEs r? `@GuillaumeGomez`

…uct, r=michaelwoerister incr: cache dwarf objects in work products Cache DWARF objects alongside object files in work products when those exist so that DWARF object files are available for thorin in packed mode in incremental scenarios. r? `@michaelwoerister`

Make MIR basic blocks field public This makes it possible to mutably borrow different fields of the MIR body without resorting to methods like `basic_blocks_local_decls_mut_and_var_debug_info`. To preserve validity of control flow graph caches in the presence of modifications, a new struct `BasicBlocks` wraps together basic blocks and control flow graph caches. The `BasicBlocks` dereferences to `IndexVec<BasicBlock, BasicBlockData>`. On the other hand a mutable access requires explicit `as_mut()` call.

…s, r=notriddle Remove (unused) inherent impl anchors This is something `@notriddle` realized a few days ago: we have unused anchors in the DOM. This PR removes them. You can test it [here](https://rustdoc.crud.net/imperio/inherent-impl-anchors/foo/index.html). r? `@notriddle`

…ts, r=Dylan-DPC Edit `rustc_mir_dataflow::framework` documentation Some edits for clarity and consistency.

Dylan-DPC · 2022-07-07T12:37:15Z

@bors r+ rollup=never p=5

bors · 2022-07-07T12:37:17Z

📌 Commit 6910d84 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2022-07-07T15:08:31Z

⌛ Testing commit 6910d84 with merge 3e51277...

bors · 2022-07-07T17:36:04Z

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 3e51277 to master...

rust-timer · 2022-07-08T04:27:56Z

Finished benchmarking commit (3e51277): comparison url.

Instruction count

Primary benchmarks: 😿 relevant regression found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	0.5%	0.5%	1
Regressions 😿 (secondary)	0.3%	0.3%	1
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-1.3%	-1.5%	6
All 😿🎉 (primary)	0.5%	0.5%	1

Max RSS (memory usage)

Results

Primary benchmarks: 🎉 relevant improvement found
Secondary benchmarks: 😿 relevant regressions found

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	2.3%	3.7%	4
Improvements 🎉 (primary)	-0.2%	-0.2%	1
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	-0.2%	-0.2%	1

Cycles

Results

Primary benchmarks: mixed results
Secondary benchmarks: no relevant changes found

	mean¹	max	count²
Regressions 😿 (primary)	3.0%	3.3%	2
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	-3.0%	-3.0%	1
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	1.0%	3.3%	3

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

the arithmetic mean of the percent change↩↩² ↩³
number of relevant changes↩↩² ↩³

Noratrieband others added 28 commits June 3, 2022 22:46

Adapt tests to be able to run in miri
907ea55
Decrease the Ns of bug loops to a smaller N, which makes them a lot faster in miri.

Remove needless FIXME
4d67f5b
In this case, it seems fine to have the field be the inverse of the flag, especially the `enable` vs `disable` terminology is clear.

Replace weird handling of edge case with panic
8192288

Remove FIXME that hasn't been an issue in practice
2d2fd31

fix projectionelem validation
a2799b2

incr: cache dwarf objects in work products
8371a03
Cache DWARF objects alongside object files in work products when those exist so that DWARF object files are available for thorin in packed mode in incremental scenarios. Signed-off-by: David Wood <david.wood@huawei.com>

ssa: remove dwo of metadata and allocator module
fc641f2
Compiling with `-Csplit-debuginfo=packed` was leaving behind `.dwo` files because either the metadata or allocator module contained a DWARF object which was not being removed by the `maybe_remove_temps_from_module` closure.

ssa: abort if dwarf packaging fails
e106523
This should have been here from the start... oops. When `thorin` fails to package a DWARF package, that should fail compilation.

Don't generate anchors on inherent impl methods
7d205af

Add test for inherent impls anchors
7967152

Edit rustc_mir_dataflow::framework documentation
8c9a130

Fix stacked borrows violation in rustc_arena
211fb66
There was a problem with storing a `Box<T>` in a struct, where the current rules would invalidate the value. this makes it store a raw pointer instead, circumventing the aliasing problems.

Document, that some lint have to be expected on the crate level (RFC …
6c6388c
…2383) Examples: NON_ASCII_IDENTS, UNCOMMON_CODEPOINTS, CONFUSABLE_IDENTS, MIXED_SCRIPT_CONFUSABLES

Add function to manually fulfill lint expectations (RFC 2383)
c8b4873

Fix #[expect] and #[allow] for clippy::duplicate_mod
a2810cd

Move is_cfg_cyclic from Body to BasicBlocks
2446b17

Move predecessors from Body to BasicBlocks
39d9c1c

Move switch_sources from Body to BasicBlocks
dfa6a7c

Move dominators from Body to BasicBlocks
17adfeb

Rollup merge ofrust-lang#96856- DrMeepster:fix_projection_validatio…
f6bbe28
…n, r=Icnr Fix ProjectionElem validation `TypeChecker::visit_projection_elem` was not actually being called.

Rollup merge ofrust-lang#97711- Nilstrieb:rustc-arena-ub, r=wesleyw…
d63c713
…iser Improve soundness of rustc_arena Make it runnable in miri by changing the loop iteration count for some tests in miri. Also fix a stacked borrows issue with box.

Rollup merge ofrust-lang#98692- camelid:more-fixmes, r=GuillaumeGomez
776bb64
rustdoc: Cleanup more FIXMEs r? `@GuillaumeGomez`

Rollup merge ofrust-lang#98981- pierwill:pierwill/dataflow-docs-edi…
6910d84
…ts, r=Dylan-DPC Edit `rustc_mir_dataflow::framework` documentation Some edits for clarity and consistency.

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jul 7, 2022

rustbot added the rollup A PR which is a rollup label Jul 7, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 7, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 7, 2022

bors merged commit 3e51277 into rust-lang:masterJul 7, 2022

rustbot added this to the 1.64.0 milestone Jul 7, 2022

This was referenced Jul 7, 2022
Allow source link to wrap onto next line #93537
Closed
Add TyAlias into rustc_type_ir TyKind enum #97974
Closed
Fix unreachable coverage generation for inlined functions #98868
Merged
Rename debugging_opts to unstable_opts#98975
Merged

rustbot added the perf-regression Performance regression. label Jul 8, 2022

c410-f3r mentioned this pull request Aug 14, 2022
ICE when returning value bound by if let ... && let ...#99852
Closed

ehuss mentioned this pull request Aug 14, 2022
ICE when compiling nalgebra 0.25.4 in Release mode #100550
Closed

Navigation Menu

Uh oh!

Uh oh!

Rollup of 8 pull requests - #99014

Rollup of 8 pull requests#99014
bors merged 28 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-n84y0jk

Dylan-DPC commented Jul 7, 2022

Uh oh!

Dylan-DPC commented Jul 7, 2022

Uh oh!

bors commented Jul 7, 2022

Uh oh!

bors commented Jul 7, 2022

Uh oh!

bors commented Jul 7, 2022

Uh oh!

rust-timer commented Jul 8, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Uh oh!

Conversation

Dylan-DPC commented Jul 7, 2022

Uh oh!

Dylan-DPC commented Jul 7, 2022

Uh oh!

bors commented Jul 7, 2022

Uh oh!

bors commented Jul 7, 2022

Uh oh!

bors commented Jul 7, 2022

Uh oh!

rust-timer commented Jul 8, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants