Rollup of 7 pull requests #124034

GuillaumeGomez · 2024-04-16T19:41:28Z

Successful merges:

Move SourceMap initialization #122811 (Move SourceMap initialization)
Match ergonomics 2024: Implement eat-one-layer #123512 (Match ergonomics 2024: Implement eat-one-layer)
Use queue-based RwLock on more platforms #123811 (Use queue-based RwLock on more platforms)
Remove uneeded clones now that TrustedStep implies Copy #123859 (Remove uneeded clones now that TrustedStep implies Copy)
Subtype predicates only exist on inference types, so we can allow them to register opaque types within them. #123979 (Subtype predicates only exist on inference types, so we can allow them to register opaque types within them.)
Outline default query and hook provider function implementations #124016 (Outline default query and hook provider function implementations)
Allow workproducts without object files. #124023 (Allow workproducts without object files.)

r? @ghost
@rustbot modify labels: rollup

Replacing `mk_session` with `sess_and_cfgs`, which does a bit more of the shared stuff -- the option parsing and the `build_configuration` call.

Currently `SourceMap` is constructed slightly later than `SessionGlobals`, and inserted. This commit changes things so they are done at the same time. Benefits: - `SessionGlobals::source_map` changes from `Lock<Option<Lrc<SourceMap>>>` to `Option<Lrc<SourceMap>>`. It's still optional, but mutability isn't required because it's initialized at construction. - `set_source_map` is removed, simplifying `run_compiler`, which is good because that's a critical function and it's nice to make it simpler. This requires moving things around a bit, so the necessary inputs are available when `SessionGlobals` is created, in particular the `loader` and `hash_kind`, which are no longer computed by `build_session`. These inputs are captured by the new `SourceMapInputs` type, which is threaded through various places.

Currently it's a method on `EarlyDiagCtxt`, which is not the right place for it at all -- `EarlyDiagCtxt` is used to issue diagnostics, but shouldn't be doing any of the actual checking. This commit moves it into a standalone function that takes an `EarlyDiagCtxt` as an argument, which is more sensible. This does require adding `EarlyDiagCtxt::early_struct_warn`, so a warning can be returned and then modified with a note. (And that likely explains why somebody put `initialize_checked_jobserver` into `EarlyDiagCtxt` in the first place.)

…m to register opaque types within them.

This is a follow up to 11fa176

This pull request partially reverts changes from e16c3b4 Original motivation for this assert was described with "A WorkProduct without a saved file is useless" which was true at the time but now it is possible to have work products with other types of files (llvm-ir, asm, etc) and there are bugreports for this failure: For example: rust-lang#123695 Fixes rust-lang#123234 Now existing `assert` and `.unwrap_or_else` are unified into a single check that emits slightly more user friendly error message if an object files was meant to be produced but it's missing

…affleLapkin Move `SourceMap` initialization So it happens at the same time as `SessionGlobals` initialization, rather than shortly afterward. r? `@WaffleLapkin`

…yer-2024, r=Nadrieril Match ergonomics 2024: Implement eat-one-layer r? `@Nadrieril` cc rust-lang#123076 `@rustbot` label A-edition-2024 A-patterns

Use queue-based `RwLock` on more platforms This switches over Windows 7, SGX and Xous to the queue-based `RwLock` implementation added in rust-lang#110211, thereby fixing rust-lang#121949 for Windows 7 and partially resolving rust-lang#114581 on SGX. TEEOS can't currently be switched because it doesn't have a good thread parking implementation. CC `@roblabla` `@raoulstrackx` `@xobs` Could you help me test this, please? r? `@ChrisDenton` the Windows stuff should be familiar to you

Remove uneeded clones now that TrustedStep implies Copy This is a follow up to 11fa176 (from rust-lang#112083)

…mpiler-errors Subtype predicates only exist on inference types, so we can allow them to register opaque types within them. We were unable to come up with an example where this could be reached (subtype predicates with either side not being an infer var gets consumed during any `select_where_possible` invocation, of which we have a lot in typeck). To ensure we don't silently accept new behaviour in case we missed a situation where this could occur, I have added an assert that prevents opaque types from having their hidden type constrained. r? `@compiler-errors`

… r=lcnr Outline default query and hook provider function implementations The default query and hook provider functions call `bug!` with a decently long message. Due to argument inlining in `format_args!` ([`flatten_format_args`](rust-lang#78356)), this ends up duplicating the message for each query, adding ~90KB to `librustc_driver.so` of unreachable panic messages. To avoid this, we can outline the common `bug!` logic.

Allow workproducts without object files. This pull request partially reverts changes from e16c3b4 Original motivation for this assert was described with "A WorkProduct without a saved file is useless" which was true at the time but now it is possible to have work products with other types of files (llvm-ir, asm, etc) and there are bugreports for this failure: For example: rust-lang#123695 Fixes rust-lang#123234 Now existing `assert` and `.unwrap_or_else` are unified into a single check that emits slightly more user friendly error message if an object files was meant to be produced but it's missing

GuillaumeGomez · 2024-04-16T19:47:15Z

@bors r+ p=5 rollup=never

bors · 2024-04-16T19:47:18Z

📌 Commit 7709b7d has been approved by GuillaumeGomez

It is now in the queue for this repository.

bors · 2024-04-16T19:52:51Z

⌛ Testing commit 7709b7d with merge 1cec373...

bors · 2024-04-16T21:58:30Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 1cec373 to master...

rust-timer · 2024-04-16T22:00:29Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#122811	Move `SourceMap` initialization	`2ce16d1a1a4bc98ff8cc0c7d13f046be9fd49d80` (link)
#123512	Match ergonomics 2024: Implement eat-one-layer	`eace3ffb22d36733d118cd88e3117903b000029e` (link)
#123811	Use queue-based `RwLock` on more platforms	`5abfe98c9c0cde6a38d05a396f2aa798bd7c6020` (link)
#123859	Remove uneeded clones now that TrustedStep implies Copy	`b2b284e20f15f2231234cc56ae387776be76162e` (link)
#123979	Subtype predicates only exist on inference types, so we can…	`72e4ce78c865ed277b144c0c14afb0f192509b87` (link)
#124016	Outline default query and hook provider function implementa…	`7e6ac8e592c0d6de98b62e6bd13202fb59a3ed3c` (link)
#124023	Allow workproducts without object files.	`3873858c0fa4f9550e0fe4689f052fed4e739a69` (link)

previous master: 468f115684

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2024-04-16T23:14:46Z

Finished benchmarking commit (1cec373): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.3%	[-0.3%, -0.3%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	3.8%	[2.1%, 5.0%]	3
Regressions ❌ (secondary)	7.5%	[7.5%, 7.5%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.8%	[2.1%, 5.0%]	3

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.2%	[0.1%, 0.2%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.0%	[-0.0%, -0.0%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[-0.0%, 0.2%]	4

Bootstrap: 677.864s -> 678.673s (0.12%)
Artifact size: 316.11 MiB -> 316.11 MiB (0.00%)

joboet and others added 24 commits April 11, 2024 19:36

std: use queue-based RwLock on SGX

a30a79c

std: use queue-based RwLock on Xous

8afee14

std: use queue-based RwLock on Windows 7

dbda4f9

Factor out common code in interface tests.

ff2e4ed

Replacing `mk_session` with `sess_and_cfgs`, which does a bit more of the shared stuff -- the option parsing and the `build_configuration` call.

Match ergonomics 2024: Implement eat-one-layer

93544d5

Properly downgrade inherited mutability

4cd87c4

Support let &mut x = &&mut 0;

b6c4097

Ensure inherited reference is never set to &mut behind an &

e3945bd

Address review comments

88cd821

Simplify calc_default_binding_mode

3efbe3e

Subtype predicates only exist on inference types, so we can allow the…

82e7773

…m to register opaque types within them.

Outline default query and hook provider function implementations

780dfb8

Remove uneeded clones now that TrustedStep implies Copy

864eb7f

This is a follow up to 11fa176

std: fix lint on SGX

10b6ca1

Rollup merge of rust-lang#122811 - nnethercote:mv-SourceMap-init, r=W…

14496d5

…affleLapkin Move `SourceMap` initialization So it happens at the same time as `SessionGlobals` initialization, rather than shortly afterward. r? `@WaffleLapkin`

Rollup merge of rust-lang#123512 - Jules-Bertholet:ref-pat-eat-one-la…

239b372

…yer-2024, r=Nadrieril Match ergonomics 2024: Implement eat-one-layer r? `@Nadrieril` cc rust-lang#123076 `@rustbot` label A-edition-2024 A-patterns

Rollup merge of rust-lang#123859 - krtab:uneeded_clone, r=cuviper

183c706

Remove uneeded clones now that TrustedStep implies Copy This is a follow up to 11fa176 (from rust-lang#112083)

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 Apr 16, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 16, 2024

bors merged commit 1cec373 into rust-lang:master Apr 16, 2024
13 checks passed

rustbot added this to the 1.79.0 milestone Apr 16, 2024

GuillaumeGomez deleted the rollup-ayztp9l branch April 16, 2024 21:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #124034

Rollup of 7 pull requests #124034

GuillaumeGomez commented Apr 16, 2024

GuillaumeGomez commented Apr 16, 2024

bors commented Apr 16, 2024

bors commented Apr 16, 2024

bors commented Apr 16, 2024

rust-timer commented Apr 16, 2024

rust-timer commented Apr 16, 2024

Rollup of 7 pull requests #124034

Rollup of 7 pull requests #124034

Conversation

GuillaumeGomez commented Apr 16, 2024

GuillaumeGomez commented Apr 16, 2024

bors commented Apr 16, 2024

bors commented Apr 16, 2024

bors commented Apr 16, 2024

rust-timer commented Apr 16, 2024

rust-timer commented Apr 16, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size