Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 5 pull requests #117444

Merged
merged 13 commits into from Oct 31, 2023
Merged

Rollup of 5 pull requests #117444

merged 13 commits into from Oct 31, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

estebank and others added 13 commits October 30, 2023 00:56
@estebank
When encountering unclosed delimiters during parsing, check for diff …
50ca5ef 
…markers

Fix rust-lang#116252.
@compiler-errors
Also consider TAIT to be uncomputable if the MIR body is tainted
48491c1
@cjgillot
Do not ICE on constant evaluation failure in GVN.
5b7cc9d
@Zalathar
coverage: Promote some debug-only checks to always run
8ef67d0 
These checks should be cheap, so there's little reason for them to be
debug-only.
@Zalathar
coverage: Replace impossible coverage::Error with assertions
6d956a2 
Historically, these errors existed so that the coverage debug code could dump
additional information before reporting a compiler bug. That debug code was
removed by rust-lang#115962, so we can now simplify these methods by making them panic
when they detect a bug.
@oli-obk
don't use the moral equivalent of assert!(false, "foo")
7c673db
@oli-obk
Simplify all require_simd invocations by moving all of the shared i…
9a49ef3 
…nvocation arguments into the macro
@oli-obk
Merge simd size and type extraction into checking whether a type is s…
f8372df 
…imd, as these always go together.
@matthiaskrgr
Rollup merge of rust-lang#116267 - oli-obk:simd_cleanups, r=petrochenkov
d0833c4 
Some codegen cleanups around SIMD checks

See rust-lang#115933 (comment) for the reason.

This PR essentially just deduplicates code by moving it into a macro
@matthiaskrgr
Rollup merge of rust-lang#116712 - estebank:issue-116252, r=petrochenkov
7035c3d 
When encountering unclosed delimiters during lexing, check for diff markers

Fix rust-lang#116252.
@matthiaskrgr
Rollup merge of rust-lang#117416 - compiler-errors:tait-in-bad-body, …
8daa317 
…r=oli-obk

Also consider TAIT to be uncomputable if the MIR body is tainted

Not totally sure if this is the best solution. We could, alternatively, look at the hir typeck results and try to take a type from there instead of just falling back to type error, inferring `u8` instead of `{type error}`. Not certain it really matters, though.

Happy to iterate on this.

Fixes rust-lang#117413

r? ``@oli-obk`` cc ``@Nadrieril``
@matthiaskrgr
Rollup merge of rust-lang#117421 - Zalathar:error, r=oli-obk,Swatinem
793776f 
coverage: Replace impossible `coverage::Error` with assertions

Historically, these errors existed so that the coverage debug code could dump additional information before reporting a compiler bug. That debug code was removed by rust-lang#115962, so we can now simplify these methods by making them panic immediately when they detect a bug.
@matthiaskrgr
Rollup merge of rust-lang#117438 - cjgillot:deterministic-error, r=ol…
f623530 
…i-obk

Do not ICE on constant evaluation failure in GVN.

Fixes rust-lang#117362
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 31, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Oct 31, 2023

📌 Commit f623530 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors 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 31, 2023
@bors
Copy link
Contributor

bors commented Oct 31, 2023

⌛ Testing commit f623530 with merge 045f158...

@bors
Copy link
Contributor

bors commented Oct 31, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 31, 2023
@bors bors merged commit 045f158 into rust-lang:master Oct 31, 2023
12 checks passed
@rustbot rustbot added this to the 1.75.0 milestone Oct 31, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#116267 Some codegen cleanups around SIMD checks ac4204b0529f77c24f992ad743b4ab37c6b0ac4c (link)
#116712 When encountering unclosed delimiters during lexing, check … d46bfc9511758278c083b7bf1b22871e3ed118e2 (link)
#117416 Also consider TAIT to be uncomputable if the MIR body is ta… 7ebf65900441a2cb6c1562e2658a14fad1dedc6c (link)
#117421 coverage: Replace impossible coverage::Error with asserti… b4130943522a3edd54ceb6d8ed548b7a3cd219a5 (link)
#117438 Do not ICE on constant evaluation failure in GVN. fbbd3535ca14f4360743545465d371a44cb32a81 (link)

previous master: 22b27120b9

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

@bors bors mentioned this pull request Oct 31, 2023
Open
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (045f158): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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)		 2.5% [1.4%, 4.3%] 4
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -4.3% [-4.3%, -4.3%] 1
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 636.003s -> 636.965s (0.15%)
Artifact size: 304.48 MiB -> 304.41 MiB (-0.02%)

@github-actions github-actions bot mentioned this pull request Nov 1, 2023
Merged
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Nov 1, 2023
@bors-ferrocene @poliorcetics
@estebank @dtolnay @celinval @compiler-errors @bors @cjgillot @lcnr @Zalathar @oli-obk
Merge #78
075dd45 
78: Automated pull from upstream `master` r=tshepang a=github-actions[bot]


This PR pulls the following changes from the upstream repository:

* rust-lang/rust#113970
* rust-lang/rust#117459
  * rust-lang/rust#117451
  * rust-lang/rust#117439
  * rust-lang/rust#117417
  * rust-lang/rust#117388
  * rust-lang/rust#113241
* rust-lang/rust#117462
* rust-lang/rust#117450
* rust-lang/rust#117407
* rust-lang/rust#117444
  * rust-lang/rust#117438
  * rust-lang/rust#117421
  * rust-lang/rust#117416
  * rust-lang/rust#116712
  * rust-lang/rust#116267
* rust-lang/rust#117377
* rust-lang/rust#117419



Co-authored-by: Alexis (Poliorcetics) Bourget <ab_github@poliorcetiq.eu>
Co-authored-by: Esteban Küber <esteban@kuber.com.ar>
Co-authored-by: David Tolnay <dtolnay@gmail.com>
Co-authored-by: Celina G. Val <celinval@amazon.com>
Co-authored-by: Michael Goulet <michael@errs.io>
Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: Camille GILLOT <gillot.camille@gmail.com>
Co-authored-by: lcnr <rust@lcnr.de>
Co-authored-by: Zalathar <Zalathar@users.noreply.github.com>
Co-authored-by: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
@matthiaskrgr matthiaskrgr deleted the rollup-43s0spc branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.75.0
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@matthiaskrgr @bors @rust-timer @rustbot @estebank @compiler-errors @cjgillot @Zalathar @oli-obk