Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

pietroalbini and others added 22 commits July 11, 2023 12:04
…em-2, r=b-naber

Fix spurious test failure with `panic=abort`

Description on why it happens and why the fix should work is in the code comments.
Bubble up nested goals from equation in `predicates_for_object_candidate`

This used to be needed for rust-lang#114036 (comment), but since it's no longer, I'm opening this as a separate PR. This also fixes one ICEing UI test: (`tests/ui/unboxed-closures/issue-53448.rs`)

r? `@lcnr`
Set max_atomic_width for sparc-unknown-linux-gnu to 32

This is currently set to 64

https://github.com/rust-lang/rust/blob/90f0b24ad3e7fc0dc0e419c9da30d74629cd5736/compiler/rustc_target/src/spec/sparc_unknown_linux_gnu.rs#L8

However, AFAIK, this architecture doesn't support 64-bit atomics, and LLVM generates libcalls: https://godbolt.org/z/chzThWGG1

(Currently, attempts to run `cargo test` for this target result in "undefined reference to `__sync_val_compare_and_swap_8'" error. taiki-e/rust-cross-toolchain@02efe1e)

r? `@Amanieu`
llvm-wrapper: adapt for LLVM API changes

No functional changes intended.

Adapts llvm-wrapper for llvm/llvm-project@65e57bb.

Found by our experimental rust + llvm @ HEAD CI:
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/21304#0189c526-86cd-4db9-bdbc-dd0132dfc22b/197-500
stabilize abi_thiscall

Closes rust-lang#42202, stabilizing the use of the "thiscall" ABI.

FCP was substituted by a poll, and the poll has been accepted.
[miri][typo] Fix a typo in a vector_block comment.
…-obk

CI: do not hide error logs in a group

This PR avoids creating a GHA group at the very end of a CI workflow when some failure has happened. Before, when a failure has happened, its GHA group was not closed, however the clock drift check function would create a new group, which would actually close the group containing the error log, thus making errors hidden by default, which is not ideal.

See discussion here: https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/GHA.20groups.20being.20closed.20on.20failures

r? bootstrap
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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. T-infra Relevant to the infrastructure 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Aug 7, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Collaborator

bors commented Aug 7, 2023

📌 Commit d9f3d49 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 Aug 7, 2023
@bors
Copy link
Collaborator

bors commented Aug 7, 2023

⌛ Testing commit d9f3d49 with merge 63a81b0...

@bors
Copy link
Collaborator

bors commented Aug 7, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 7, 2023
@bors bors merged commit 63a81b0 into rust-lang:master Aug 7, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 7, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#113568 Fix spurious test failure with panic=abort d08b0478cd8ba6d576f88b9dd98d8914143ec008 (link)
#114196 Bubble up nested goals from equation in `predicates_for_obj… ed1be4f380ed675fa3fc18a83cafe4d48fc6b605 (link)
#114485 Add trait decls to SMIR c0be0e58e5051c1d93293095b7050e78532601ad (link)
#114495 Set max_atomic_width for AVR to 16 1b10515fa769fb4112682ccb5c5313908698f5ad (link)
#114496 Set max_atomic_width for sparc-unknown-linux-gnu to 32 665832a72efc42e1ed33ff440d53e0d0b19d0da1 (link)
#114510 llvm-wrapper: adapt for LLVM API changes 29c7cc6f83e8634069e1b6529c99ffba9f75e1b6 (link)
#114562 stabilize abi_thiscall b2b41d2970281a59afb1ef635f33e63afbec5474 (link)
#114570 [miri][typo] Fix a typo in a vector_block comment. 4abb11cf37dd634d79dc9510e4df1dd42613d86c (link)
#114573 CI: do not hide error logs in a group f538b9b5e9bfe0b5aa7370e70e4e5f6618e97c96 (link)

previous master: 84ec2633de

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

falcucci added a commit to falcucci/changelog-it that referenced this pull request Aug 7, 2023
adds the list of contributors to the template. the contributors are: enselic, ralfjung, trolldemorted, matthiaskrgr, ttsugriy, kobzol, and lnicola.

this commit updates `example.md` by adding the contributors to the list. the changes can be seen in the diff:

```diff
diff --git a/templates/example.md b/templates/example.md
index a128037..da0ecc8 100644
--- a/templates/example.md
+++ b/templates/example.md
@@ -10,3 +10,16 @@
 - [ci: do not hide error logs in a group](rust-lang/rust#114573)
 - [:arrow_up: `rust-analyzer`](rust-lang/rust#114576)
 - [rollup of 9 pull requests](rust-lang/rust#114585)
+
+### contributors
+
+- [enselic](https://github.com/enselic)
+- [enselic](https://github.com/enselic)
+- [ralfjung](https://github.com/ralfjung)
+- [trolldemorted](https://github.com/trolldemorted)
+- [matthiaskrgr](https://github.com/matthiaskrgr)
+- [matthiaskrgr](https://github.com/matthiaskrgr)
+- [ttsugriy](https://github.com/ttsugriy)
+- [kobzol](https://github.com/kobzol)
+- [lnicola](https://github.com/lnicola)
+- [matthiaskrgr](https://github.com/matthiaskrgr)
```
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (63a81b0): 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)
- - 0
Improvements ✅
(primary)
-5.2% [-5.2%, -5.2%] 1
Improvements ✅
(secondary)
-4.2% [-4.3%, -4.1%] 2
All ❌✅ (primary) -5.2% [-5.2%, -5.2%] 1

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: 650.87s -> 651.258s (0.06%)

@matthiaskrgr matthiaskrgr deleted the rollup-h26pvus branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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. T-infra Relevant to the infrastructure 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.