Rollup of 5 pull requests #97825

Dylan-DPC · 2022-06-07T09:41:10Z

Successful merges:

Various refactors to the incr comp workproduct handling #97058 (Various refactors to the incr comp workproduct handling)
Allow unstable items to be re-exported unstably without requiring the feature be enabled #97301 (Allow unstable items to be re-exported unstably without requiring the feature be enabled)
Fix ICEs from zsts within unsized types with non-zero offsets #97738 (Fix ICEs from zsts within unsized types with non-zero offsets)
Remove SIGIO reference on Haiku #97771 (Remove SIGIO reference on Haiku)
Add some unstable target features for the wasm target codegen #97808 (Add some unstable target features for the wasm target codegen)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

… alloc

… feature be enabled

Haiku doesn't define SIGIO. The nix crate already employs this workaround: https://github.com/nix-rust/nix/blob/5dedbc7850448ae3922ab0a833f3eb971bf7e25f/src/sys/signal.rs#L92-L94

This is a tiny optimization

It returns the previous work product or panics if there is none. This rename makes the purpose of this method clearer.

…e_dir calls

This improves clarity of the code a bit

A WorkProduct without a saved file is useless

Co-authored-by: Eduard-Mihai Burtescu <edy.burt@gmail.com>

I was experimenting with cross-language LTO for the wasm target recently between Rust and C and found that C was injecting the `+mutable-globals` flag on all functions. When specifying the corresponding `-Ctarget-feature=+mutable-globals` feature to Rust it prints a warning about an unknown feature. I've added the `mutable-globals` feature plus another few I know of to the list of known features for wasm targets. These features all continue to be unstable to source code as they were before.

…, r=nagisa Various refactors to the incr comp workproduct handling This is the result of me looking into adding support for having multiple object files for a single codegen unit to incr comp. This is necessary to support inline assembly in cg_clif without requiring partial linking which is not supported on Windows and seems to fail on macOS for some reason. Cg_clif uses an external assembler to handle inline asm and thus produces one object file with regular functions and one object file containing compiled inline asm for each codegen unit which uses inline asm. Current incr comp can't handle this. This PR doesn't yet add support for this, but it makes it easier to do so.

…rochenkov Allow unstable items to be re-exported unstably without requiring the feature be enabled Closes rust-lang#94972 The diagnostic may need some work still, and I haven't added a test yet

Fix ICEs from zsts within unsized types with non-zero offsets - Fixes rust-lang#97732 - Fixes ICEs while compiling `alloc` with `-Z randomize-layout` r? ``@eddyb``

Remove SIGIO reference on Haiku Haiku doesn't define SIGIO. The nix crate already employs this workaround: https://github.com/nix-rust/nix/blob/5dedbc7850448ae3922ab0a833f3eb971bf7e25f/src/sys/signal.rs#L92-L94

…chenkov Add some unstable target features for the wasm target codegen I was experimenting with cross-language LTO for the wasm target recently between Rust and C and found that C was injecting the `+mutable-globals` flag on all functions. When specifying the corresponding `-Ctarget-feature=+mutable-globals` feature to Rust it prints a warning about an unknown feature. I've added the `mutable-globals` feature plus another few I know of to the list of known features for wasm targets. These features all continue to be unstable to source code as they were before.

Dylan-DPC · 2022-06-07T10:00:41Z

@bors r+ rollup=never p=5

bors · 2022-06-07T10:00:43Z

📌 Commit 9526653 has been approved by Dylan-DPC

bors · 2022-06-07T11:09:07Z

⌛ Testing commit 9526653 with merge 7fe2c4b...

bors · 2022-06-07T13:50:49Z

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

rust-timer · 2022-06-07T15:07:48Z

Finished benchmarking commit (7fe2c4b): comparison url.

Instruction count

Primary benchmarks: 😿 relevant regressions found
Secondary benchmarks: no relevant changes found

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

Max RSS (memory usage)

Results

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

	mean¹	max	count²
Regressions 😿 (primary)	1.2%	1.2%	1
Regressions 😿 (secondary)	3.6%	3.6%	1
Improvements 🎉 (primary)	-2.9%	-2.9%	1
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	-0.9%	-2.9%	2

Cycles

Results

Primary benchmarks: no relevant changes found
Secondary benchmarks: 😿 relevant regression found

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	2.9%	2.9%	1
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	N/A	N/A	0

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 ↩ ↩² ↩³

pnkfelix · 2022-06-14T20:52:50Z

stm32f4-0.14.0 regressed for check+debug+opt on incr-patched: negate. diesel-1.4.8 regressed for check on incr-patched: println

Given that all the regressions are to incremental, I'm assuming this is because of #97058

pnkfelix · 2022-06-14T20:59:45Z

Skimming over #97058, nothing stands out as being an obvious cause for a regression, even a small one.

pnkfelix · 2022-06-14T21:10:08Z

skimming over the perf details for stm32f4 check, it seems like the bulk of the time delta is coming from expand_crate. A total time delta of 0.66, and the biggest contributors to that delta are expand_crate (0.033), incr_comp_load_dep_graph (0.015), misc_checking_1 (0.007), hir_owner_nodes (0.005), generate_crate_metadata (0.005), incr_comp_encode_dep_graph (0.004), and wf_checking (0.004). The remainder are <= 0.003, most of them <= 0.000.

pnkfelix · 2022-06-14T21:12:49Z

given the relatively small size and scope of the regression, and the fact that it was in a rollup, I do not think this is worth investigating further.

@rustbot label: +perf-regression-triaged

Rollup of 5 pull requests Successful merges: - rust-lang#97058 (Various refactors to the incr comp workproduct handling) - rust-lang#97301 (Allow unstable items to be re-exported unstably without requiring the feature be enabled) - rust-lang#97738 (Fix ICEs from zsts within unsized types with non-zero offsets) - rust-lang#97771 (Remove SIGIO reference on Haiku) - rust-lang#97808 (Add some unstable target features for the wasm target codegen) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Kixiron and others added 16 commits June 4, 2022 12:33

Fixed premature assertions that caused -Z randomize-layout to fail on…

ba2f14e

… alloc

Added test for rust-lang#97732

857453d

Allow unstable items to be re-exported unstably without requiring the…

f3d93b6

… feature be enabled

Remove SIGIO reference on Haiku

fac5cbc

Haiku doesn't define SIGIO. The nix crate already employs this workaround: https://github.com/nix-rust/nix/blob/5dedbc7850448ae3922ab0a833f3eb971bf7e25f/src/sys/signal.rs#L92-L94

Remove unnecessary cgu name length hash

85136db

This is a tiny optimization

Rename CodegenUnit::work_product to previous_work_product

02162c4

It returns the previous work product or panics if there is none. This rename makes the purpose of this method clearer.

Avoid an unnecessary clone for copy_cgu_workproduct_to_incr_comp_cach…

065e202

…e_dir calls

Factor Option out of copy_cgu_workproduct_to_incr_comp_cache_dir call

906b851

This improves clarity of the code a bit

Make saved_file field of WorkProduct non-optional

e16c3b4

A WorkProduct without a saved file is useless

Update src/test/ui/unsized/issue-97732.rs

10336cf

Co-authored-by: Eduard-Mihai Burtescu <edy.burt@gmail.com>

Rollup merge of rust-lang#97301 - semicoleon:unstable-reexport, r=pet…

2035b50

…rochenkov Allow unstable items to be re-exported unstably without requiring the feature be enabled Closes rust-lang#94972 The diagnostic may need some work still, and I haven't added a test yet

Rollup merge of rust-lang#97738 - Kixiron:zst-panic, r=eddyb

62c260d

Fix ICEs from zsts within unsized types with non-zero offsets - Fixes rust-lang#97732 - Fixes ICEs while compiling `alloc` with `-Z randomize-layout` r? ``@eddyb``

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 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 Jun 7, 2022

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

bors merged commit 7fe2c4b into rust-lang:master Jun 7, 2022

rustbot added this to the 1.63.0 milestone Jun 7, 2022

rustbot added the perf-regression Performance regression. label Jun 7, 2022

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 14, 2022

lqd mentioned this pull request Aug 18, 2023

ICE in rustc_borrowck/src/region_infer #114907

Closed

This was referenced Nov 17, 2023

ice: None in region_errors #118021

Closed

ICE: region_errors: None #118156

Closed

matthiaskrgr mentioned this pull request Feb 29, 2024

ICE: ty type is a ref but hir type is not #121816

Closed

matthiaskrgr mentioned this pull request Mar 18, 2024

ICE: can't find an upper bound in nll::compute_regions in rustc_borrowck #122704

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #97825

Rollup of 5 pull requests #97825

Dylan-DPC commented Jun 7, 2022

Dylan-DPC commented Jun 7, 2022

bors commented Jun 7, 2022

bors commented Jun 7, 2022

bors commented Jun 7, 2022

rust-timer commented Jun 7, 2022

pnkfelix commented Jun 14, 2022

pnkfelix commented Jun 14, 2022

pnkfelix commented Jun 14, 2022

pnkfelix commented Jun 14, 2022

Rollup of 5 pull requests #97825

Rollup of 5 pull requests #97825

Conversation

Dylan-DPC commented Jun 7, 2022

Dylan-DPC commented Jun 7, 2022

bors commented Jun 7, 2022

bors commented Jun 7, 2022

bors commented Jun 7, 2022

rust-timer commented Jun 7, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

pnkfelix commented Jun 14, 2022

pnkfelix commented Jun 14, 2022

pnkfelix commented Jun 14, 2022

pnkfelix commented Jun 14, 2022