Rollup of 8 pull requests #107328

matthiaskrgr · 2023-01-26T14:02:23Z

Successful merges:

Preserve split DWARF files when building archives. #106904 (Preserve split DWARF files when building archives.)
Handle diagnostics customization on the fluent side (for one specific diagnostic) #106971 (Handle diagnostics customization on the fluent side (for one specific diagnostic))
Migrate mir_build's borrow conflicts #106978 (Migrate mir_build's borrow conflicts)
ty::tls cleanups #107150 (ty::tls cleanups)
Use a type-alias-impl-trait in ObligationForest #107168 (Use a type-alias-impl-trait in ObligationForest)
Encode info for Adt in a single place. #107189 (Encode info for Adt in a single place.)
Custom mir: Add support for some remaining, easy to support constructs #107322 (Custom mir: Add support for some remaining, easy to support constructs)
Disable ConstGoto opt in cleanup blocks #107323 (Disable ConstGoto opt in cleanup blocks)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

The optimization that removes artifacts when building libraries is correct from the compiler's perspective but not from a debugger's perspective. Unpacked split debuginfo is referred to by filename and debuggers need the artifact that contains debuginfo to continue to exist at that path. Ironically the test expects the correct behavior but it was not running.

Putting the cfged functions into a seperate module and giving them better names.

…, r=davidtwco Preserve split DWARF files when building archives. r? ```@davidtwco```

Handle diagnostics customization on the fluent side (for one specific diagnostic) r? ```@davidtwco```

Migrate mir_build's borrow conflicts This also changes the error message slightly, for two reasons: - I'm not a fan of saying "value borrowed, by `x`, here" - it simplifies the error implementation significantly.

…=cjgillot `ty::tls` cleanups Pull it out into a separate file, make the conditional compilation more obvious and give the internal functions better names. Pulled out of rust-lang#106311 r? cjgillot

…orest,can-we-know-it-wasnt-revealed, r=oli-obk Use a type-alias-impl-trait in `ObligationForest`

Encode info for Adt in a single place. Split from rust-lang#98867

Custom mir: Add support for some remaining, easy to support constructs Some documentation for previous changes and support for `Deinit`, checked binops, len, and array repetition r? ```@oli-obk``` or ```@tmiasko```

Disable ConstGoto opt in cleanup blocks Fixes rust-lang#107315 . There is probably a smaller hammer that we could use here, but none that is super obviously correct. We can always revisit this in the future. Could not add a test because custom mir does not support cleanup blocks. However, did check that the fallible_iterator crate no longer ICEs with the other PR cherry picked. r? `@tmiasko`

matthiaskrgr · 2023-01-26T14:02:46Z

@bors r+ rollup=never p=8

bors · 2023-01-26T14:02:48Z

📌 Commit 4ed8cfc has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-01-26T15:58:12Z

⌛ Testing commit 4ed8cfc with merge c62665e...

bors · 2023-01-26T19:28:41Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing c62665e to master...

rust-timer · 2023-01-26T19:30:59Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#107323	af2fba1f71ec0bef9243d74ae9c83f8363313d2a
#107322	51a0555128fac8217af1a55b3533ecd1a18f17f7
#107189	ab8340e5a4052ca4890d5be8aa36c52c67e27c79
#107168	60405a1e3a25a011615f878cfc25981baf8d8ee0
#107150	7bc12522fffe8bd38a5c214b7cb9096e4a1899f2
#106978	6a36e83ed53a10657741768e56048d386c88f28b
#106971	fac6c8f66b879e8460a3883b48d49e0012a7e194
#106904	a06796e7b7f8a0aee236bcfa1076a9b319106137

previous master: 3e97763872

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 · 2023-01-26T20:49:10Z

Finished benchmarking commit (c62665e): comparison URL.

Overall result: ❌✅ regressions and 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.8%	[0.8%, 0.8%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.8%	[-1.5%, -0.4%]	4
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)	0.8%	[0.8%, 0.8%]	1
Regressions ❌ (secondary)	1.7%	[1.7%, 1.7%]	1
Improvements ✅ (primary)	-2.5%	[-2.5%, -2.5%]	1
Improvements ✅ (secondary)	-2.9%	[-6.9%, -1.0%]	4
All ❌✅ (primary)	-0.9%	[-2.5%, 0.8%]	2

Cycles

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
Regressions ❌ (secondary)	1.6%	[1.6%, 1.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

khuey and others added 21 commits January 15, 2023 09:40

Empty regions don't exist anymore, remove them from fluent

1a6ab6c

Handle diagnostics customization on the fluent side

64e5f91

Migrate mir_build's borrow conflicts

6fe4cf7

Move ty::tls to seperate file

afd5307

Some ty::tls cleanups

0d11b77

Putting the cfged functions into a seperate module and giving them better names.

Use strict provenance APIs in ty::tls

db305d0

Use a type-alias-impl-trait in ObligationForest

f74ca88

Encode AdtDef in the def-id loop.

d7f6564

Inline encode_enum_variant_info.

6ecf30d

Tweak comments.

4d11206

Custom mir: Add support for some remaining, easy to support constructs

d7f59e9

Disable ConstGoto opt in cleanup blocks

f8aaf9a

Rollup merge of rust-lang#106904 - khuey:preserve_debuginfo_for_rlibs…

1b442be

…, r=davidtwco Preserve split DWARF files when building archives. r? ```@davidtwco```

Rollup merge of rust-lang#106971 - oli-obk:tait_error, r=davidtwco

4b97f07

Handle diagnostics customization on the fluent side (for one specific diagnostic) r? ```@davidtwco```

Rollup merge of rust-lang#106978 - mejrs:mir_build3, r=davidtwco

e8c17de

Migrate mir_build's borrow conflicts This also changes the error message slightly, for two reasons: - I'm not a fan of saying "value borrowed, by `x`, here" - it simplifies the error implementation significantly.

Rollup merge of rust-lang#107150 - Nilstrieb:thread-local-cleanups, r…

70a665a

…=cjgillot `ty::tls` cleanups Pull it out into a separate file, make the conditional compilation more obvious and give the internal functions better names. Pulled out of rust-lang#106311 r? cjgillot

Rollup merge of rust-lang#107168 - Nilstrieb:if-a-tait-falls-in-the-f…

3c145ff

…orest,can-we-know-it-wasnt-revealed, r=oli-obk Use a type-alias-impl-trait in `ObligationForest`

Rollup merge of rust-lang#107189 - cjgillot:meta-adt, r=compiler-errors

82455a7

Encode info for Adt in a single place. Split from rust-lang#98867

Rollup merge of rust-lang#107322 - JakobDegen:custom-mir, r=tmiasko

c87996a

Custom mir: Add support for some remaining, easy to support constructs Some documentation for previous changes and support for `Deinit`, checked binops, len, and array repetition r? ```@oli-obk``` or ```@tmiasko```

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 Jan 26, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 26, 2023

bors merged commit c62665e into rust-lang:master Jan 26, 2023

rustbot added this to the 1.69.0 milestone Jan 26, 2023

This was referenced Jan 26, 2023

Don't monomorphize ty::tls closures in rustc_query_impl #106311

Closed

Fix def-use dominance check #107097

Merged

matthiaskrgr deleted the rollup-lfqwo0o branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #107328

Rollup of 8 pull requests #107328

matthiaskrgr commented Jan 26, 2023

matthiaskrgr commented Jan 26, 2023

bors commented Jan 26, 2023

bors commented Jan 26, 2023

bors commented Jan 26, 2023

rust-timer commented Jan 26, 2023

rust-timer commented Jan 26, 2023

Rollup of 8 pull requests #107328

Rollup of 8 pull requests #107328

Conversation

matthiaskrgr commented Jan 26, 2023

matthiaskrgr commented Jan 26, 2023

bors commented Jan 26, 2023

bors commented Jan 26, 2023

bors commented Jan 26, 2023

rust-timer commented Jan 26, 2023

rust-timer commented Jan 26, 2023

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles