Rollup of 8 pull requests #103727

GuillaumeGomez · 2022-10-29T12:18:06Z

Successful merges:

compiletest: Refactor test rustcflags #102634 (compiletest: Refactor test rustcflags)
Prevent foreign Rust exceptions from being caught #102721 (Prevent foreign Rust exceptions from being caught)
filter candidates in pick probe for diagnostics #103415 (filter candidates in pick probe for diagnostics)
Rename some OwnerId fields. #103618 (Rename some OwnerId fields.)
Accept TyCtxt instead of TyCtxtAt in Ty::is_* functions #103625 (Accept TyCtxt instead of TyCtxtAt in Ty::is_* functions)
Add missing impl blocks for item reexported from private mod in JSON output #103653 (Add missing impl blocks for item reexported from private mod in JSON output)
Emit proper error when casting to dyn* #103699 (Emit proper error when casting to dyn*)
fix typo in try_reserve method from HashMap and HashSet #103719 (fix typo in try_reserve method from HashMap and HashSet)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>

Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>

Functions in answer: - `Ty::is_freeze` - `Ty::is_sized` - `Ty::is_unpin` - `Ty::is_copy_modulo_regions`

spastorino noticed some silly expressions like `item_id.def_id.def_id`. This commit renames several `def_id: OwnerId` fields as `owner_id`, so those expressions become `item_id.owner_id.def_id`. `item_id.owner_id.local_def_id` would be even clearer, but the use of `def_id` for values of type `LocalDefId` is *very* widespread, so I left that alone.

…output

…lags, r=Mark-Simulacrum compiletest: Refactor test rustcflags Refactoring `host-rustcflags` and `target-rustcflags` from `Option<String>` to `Vec<String>` Ref: rust-lang#102438 r? `@Mark-Simulacrum`

Prevent foreign Rust exceptions from being caught Fix rust-lang#102715 Use the address of a static variable (which is guaranteed to be unique per copy of std) to tell apart if a Rust exception comes from local or foreign Rust code, and abort for the latter.

…-on-diagnostic, r=TaKO8Ki filter candidates in pick probe for diagnostics Fixes rust-lang#103411, though also fine with closing this PR if my opinion (rust-lang#103411 (comment)) is shared that this doesn't need to be fixed. ``` ~/rust3$ time rustc +nightly ~/test.rs 2>/dev/null real 0m4.853s user 0m4.837s sys 0m0.016s ~/rust3$ time rustc +rust3 ~/test.rs 2>/dev/null real 0m0.193s user 0m0.169s sys 0m0.024s ``` Also fixes rust-lang#103427.

… r=compiler-errors Rename some `OwnerId` fields. `@spastorino` noticed some silly expressions like `item_id.def_id.def_id`. This commit renames several `def_id: OwnerId` fields as `owner_id`, so those expressions become `item_id.owner_id.def_id`. `item_id.owner_id.local_def_id` would be even clearer, but the use of `def_id` for values of type `LocalDefId` is *very* widespread, so I left that alone. r? `@compiler-errors`

…d, r=compiler-errors Accept `TyCtxt` instead of `TyCtxtAt` in `Ty::is_*` functions Functions in answer: - `Ty::is_freeze` - `Ty::is_sized` - `Ty::is_unpin` - `Ty::is_copy_modulo_regions` This allows to remove a lot of useless `.at(DUMMY_SP)`, making the code a bit nicer :3 r? `@compiler-errors`

…e-json, r=notriddle Add missing impl blocks for item reexported from private mod in JSON output Fixes rust-lang#102583. Since we don't inline for the JSON output, the impl blocks from private modules are not present when we generate the output. To go around this limitation, in case the impl block doesn't have `#[doc(hidden)]` and is implementing a public item, we don't strip it. cc `@fmease` `@aDotInTheVoid` r? `@notriddle`

… r=TaKO8Ki Emit proper error when casting to `dyn*` Fixes rust-lang#103679

…the8472 fix typo in `try_reserve` method from `HashMap` and `HashSet` Currently refers to the `reserve` method, instead of `try_reserve`. Other collections like [Vec](https://doc.rust-lang.org/std/vec/struct.Vec.html#method.try_reserve) & [VecDeque](https://doc.rust-lang.org/std/collections/vec_deque/struct.VecDeque.html#method.try_reserve) shows it well.

GuillaumeGomez · 2022-10-29T12:18:19Z

@bors r+ p=8 rollup=never

bors · 2022-10-29T12:18:21Z

📌 Commit 6425764 has been approved by GuillaumeGomez

It is now in the queue for this repository.

bors · 2022-10-29T14:14:11Z

⌛ Testing commit 6425764 with merge 68c836a...

bors · 2022-10-29T17:06:40Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 68c836a to master...

rust-timer · 2022-10-29T17:08:56Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#103719	dfae59caf3fb42f61d2909a9ef5a9c6298787a1d
#103699	a0d9a19e4dc6028b05ab0e34fee81493883b95de
#103653	68127fa6397c3c9b65b844f76e7e6c3b81d10d21
#103625	0d6d7e6d004bdaa292f4c00b601ef1c5251f18b7
#103618	16e180b3987db0687643bb8ad58a988f4121f252
#103415	085974ad6eb38a8e42f2c834e5de2d5320248dab
#102721	f5d3726b8e61b2adf623da9cafc8b3997a61087f
#102634	db446e1cc81c1363f560b7ebf50acdab169abaac

previous master: 33b530e040

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 · 2022-10-29T19:59:00Z

Finished benchmarking commit (68c836a): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

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
cc @rust-lang/wg-compiler-performance

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)	1.3%	[1.2%, 1.4%]	2
Regressions ❌ (secondary)	1.9%	[0.4%, 4.1%]	13
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.3%	[1.2%, 1.4%]	2

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
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.0%	[-3.2%, -2.7%]	4
All ❌✅ (primary)	-	-	0

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)	2.6%	[2.1%, 3.1%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

nnethercote · 2022-10-30T04:01:49Z

keccak, cranelift, and wg-grammar have all been noisy lately. The deep-vector result is less obviously bogus, but given that only one of the 16 measurements regressed that much, it's probably also not genuine.

@rustbot label: +perf-regression-triaged

…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#102634 (compiletest: Refactor test rustcflags) - rust-lang#102721 (Prevent foreign Rust exceptions from being caught) - rust-lang#103415 (filter candidates in pick probe for diagnostics) - rust-lang#103618 (Rename some `OwnerId` fields.) - rust-lang#103625 (Accept `TyCtxt` instead of `TyCtxtAt` in `Ty::is_*` functions) - rust-lang#103653 (Add missing impl blocks for item reexported from private mod in JSON output) - rust-lang#103699 (Emit proper error when casting to `dyn*`) - rust-lang#103719 (fix typo in `try_reserve` method from `HashMap` and `HashSet`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

andrewpollack and others added 26 commits October 19, 2022 18:33

compiletest: refactor rustcflags to Vec

47703d3

filter candidates in pick probe for diagnostics

4216cae

Prevent foreign Rust exceptions from being caught

e521a8d

Implement Rust foreign exception protection for EMCC and SEH

86c65d2

Add test case for foreign Rust exceptions

daf3063

Apply suggestion

979d1a2

Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>

Fix alloc size

4e6d60c

Fix windows compilation

c9cca33

Update src/tools/compiletest/src/runtest.rs

f01608c

Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>

Accept TyCtxt instead of TyCtxtAt in Ty::is_* functions

a17ccfa

Functions in answer: - `Ty::is_freeze` - `Ty::is_sized` - `Ty::is_unpin` - `Ty::is_copy_modulo_regions`

Update tooling

dc53c8f

Update miri

c8c4971

Ignore test on mingw32

bfac2da

Emit proper error when casting to Ddyn-star

c442013

fix typo in hashmap and hashset try_reserve method

4b35313

Add missing impl blocks for item reexported from private mod in JSON …

f0234f1

…output

Add regression test for missing item from private mod in JSON output

0ef36b8

Rollup merge of rust-lang#102634 - andrewpollack:refactor-test-rustcf…

73e7c3a

…lags, r=Mark-Simulacrum compiletest: Refactor test rustcflags Refactoring `host-rustcflags` and `target-rustcflags` from `Option<String>` to `Vec<String>` Ref: rust-lang#102438 r? `@Mark-Simulacrum`

Rollup merge of rust-lang#103699 - compiler-errors:dyn-star-cast-bad,…

679771f

… r=TaKO8Ki Emit proper error when casting to `dyn*` Fixes rust-lang#103679

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 Oct 29, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 29, 2022

bors merged commit 68c836a into rust-lang:master Oct 29, 2022

rustbot added this to the 1.66.0 milestone Oct 29, 2022

rustbot added the perf-regression Performance regression. label Oct 29, 2022

rustbot added the perf-regression-triaged The performance regression has been triaged. label Oct 30, 2022

GuillaumeGomez deleted the rollup-hfyxccr branch October 30, 2022 10:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #103727

Rollup of 8 pull requests #103727

GuillaumeGomez commented Oct 29, 2022

GuillaumeGomez commented Oct 29, 2022

bors commented Oct 29, 2022

bors commented Oct 29, 2022

bors commented Oct 29, 2022

rust-timer commented Oct 29, 2022

rust-timer commented Oct 29, 2022

nnethercote commented Oct 30, 2022

Rollup of 8 pull requests #103727

Rollup of 8 pull requests #103727

Conversation

GuillaumeGomez commented Oct 29, 2022

GuillaumeGomez commented Oct 29, 2022

bors commented Oct 29, 2022

bors commented Oct 29, 2022

bors commented Oct 29, 2022

rust-timer commented Oct 29, 2022

rust-timer commented Oct 29, 2022

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

nnethercote commented Oct 30, 2022