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.

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

interpret/miri: call the panic_nounwind machinery the same way codegen does #114993

Merged
merged 6 commits into from
Aug 20, 2023

Conversation

RalfJung
Copy link
Member

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Aug 19, 2023

r? @fee1-dead

(rustbot has picked a reviewer for you, use r? to override)

@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. labels Aug 19, 2023
@rustbot
Copy link
Collaborator

rustbot commented Aug 19, 2023

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

This PR changes MIR

cc @oli-obk, @RalfJung, @JakobDegen, @davidtwco, @celinval, @vakaras

The Miri subtree was changed

cc @rust-lang/miri

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rustbot
Copy link
Collaborator

rustbot commented Aug 19, 2023

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in src/tools/rust-analyzer

cc @rust-lang/rust-analyzer

@RalfJung
Copy link
Member Author

Hm I didn't want to factor out the first commit (rename unwind-related MIR terminators to clarify their purpose) since it would have conflicted with the rest, but maybe I should have... oh well.

@rust-log-analyzer

This comment has been minimized.

Copy link
Member

@fee1-dead fee1-dead left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I think leaving the strings as is is fine (maybe a followup) since it would change mir-opt tests.

compiler/rustc_middle/src/mir/spanview.rs Outdated Show resolved Hide resolved
compiler/rustc_middle/src/mir/syntax.rs Outdated Show resolved Hide resolved
@fee1-dead
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 20, 2023

📌 Commit 4ea62dd382617244509c7269c52b42aba700cec0 has been approved by fee1-dead

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 20, 2023
@RalfJung
Copy link
Member Author

@bors r-
I did adjust the printing logic. Let's see if CI is happy. mir-opt blessing didn't produce a diff...

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 20, 2023
@RalfJung
Copy link
Member Author

@bors r=fee1-dead

@bors
Copy link
Contributor

bors commented Aug 20, 2023

📌 Commit d3e539956c32182829afb2dfa52541d0f8ae239a has been approved by fee1-dead

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 20, 2023
@bors
Copy link
Contributor

bors commented Aug 20, 2023

☔ The latest upstream changes (presumably #113124) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 20, 2023
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 20, 2023
@bors
Copy link
Contributor

bors commented Aug 20, 2023

⌛ Testing commit 49b5701 with merge 15808aaf5539142974b710017bfd95236943704b...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Aug 20, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 20, 2023
@RalfJung
Copy link
Member Author

RalfJung commented Aug 20, 2023

@rust-lang/rust-analyzer something odd is happening. RA is failing to build on the dist-riscv64-linux builder, but it checks successfully locally. The build errors indicate that it is importing a version of rustc from before this PR. What is going on there?

Building stage1 tool rust-analyzer (x86_64-unknown-linux-gnu -> riscv64gc-unknown-linux-gnu)
[...]
  error[E0599]: no variant or associated item named `UnwindResume` found for enum `mir::TerminatorKind` in the current scope
     --> crates/hir-ty/src/mir/borrowck.rs:163:35
      |
  163 |                 | TerminatorKind::UnwindResume
      |                                   ^^^^^^^^^^^^ variant or associated item not found in `TerminatorKind`
      |
     ::: crates/hir-ty/src/mir.rs:346:1

@RalfJung
Copy link
Member Author

Ah, actually ./x.py check rust-analyzer also fails locally. I though I had done this. Is RA not covered by PR CI?
And why doesn't it pick up the changes from this PR?!?

@RalfJung
Copy link
Member Author

Oh wait. These are complete copies of the rustc types it seems? Ugh yeah then my search-and-replace would have gone wrong.^^

@RalfJung
Copy link
Member Author

Okay so the only really odd thing is that I changed files in src/tools/rust-analyzer and yet PR CI didn't even check if RA still builds.

@bors r=fee1-dead

@bors
Copy link
Contributor

bors commented Aug 20, 2023

📌 Commit 0277351 has been approved by fee1-dead

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 20, 2023
@lnicola
Copy link
Member

lnicola commented Aug 20, 2023

Yeah, we don't depend on the rustc crates, with a couple of exceptions. It's okay to have this in here, but most RA changes are supposed to go through upstream unless they really depend on something in this repo (i.e. the proc macro server).

@RalfJung
Copy link
Member Author

most RA changes are supposed to go through upstream unless they really depend on something in this repo (i.e. the proc macro server).

Ah, sorry. It looked like the rustc types so I assumed I did have to patch them to get things to build again.

@bors
Copy link
Contributor

bors commented Aug 20, 2023

⌛ Testing commit 0277351 with merge 5c6a7e7...

@bors
Copy link
Contributor

bors commented Aug 20, 2023

☀️ Test successful - checks-actions
Approved by: fee1-dead
Pushing 5c6a7e7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 20, 2023
@bors bors merged commit 5c6a7e7 into rust-lang:master Aug 20, 2023
@rustbot rustbot added this to the 1.74.0 milestone Aug 20, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (5c6a7e7): 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)

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

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

Binary size

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

Bootstrap: 636.088s -> 635.074s (-0.16%)
Artifact size: 346.98 MiB -> 346.88 MiB (-0.03%)

@RalfJung RalfJung deleted the panic-nounwind branch August 21, 2023 05:57
celinval added a commit to model-checking/kani that referenced this pull request Aug 24, 2023
tautschnig pushed a commit to tautschnig/kani that referenced this pull request Aug 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.

7 participants