Skip to content

Add more ABI test cases to miri (RFC 3391)#125672

Merged
bors merged 2 commits intorust-lang:masterfrom
Lokathor:update-miri-result-ffi
Jun 5, 2024
Merged

Add more ABI test cases to miri (RFC 3391)#125672
bors merged 2 commits intorust-lang:masterfrom
Lokathor:update-miri-result-ffi

Conversation

@Lokathor
Copy link
Contributor

@Lokathor Lokathor commented May 28, 2024

Part of #110503

cc @RalfJung

@rustbot
Copy link
Collaborator

rustbot commented May 28, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 28, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 28, 2024

The Miri subtree was changed

cc @rust-lang/miri

@Lokathor
Copy link
Contributor Author

Lokathor commented May 28, 2024

This doesn't touch line 91 so i'm not sure why it shows that line as having a conflict. I updated my fork just moments before adding these test lines so I'd be shocked if it was out of date already.

@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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) labels May 28, 2024
@rustbot

This comment was marked as outdated.

Sign in to view
@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 28, 2024
@rustbot

This comment was marked as outdated.

Sign in to view
@Lokathor
Copy link
Contributor Author

Lokathor commented May 28, 2024

Oh no I think this all went wrong.

@saethlin saethlin force-pushed the update-miri-result-ffi branch from 8399e6c to d1b7322 Compare May 28, 2024 23:55
@rustbot rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 28, 2024
@saethlin saethlin removed A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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) labels May 28, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
Copy link
Member

RalfJung commented May 29, 2024

Looks like we need changes to the ABI check logic as well, not just a new test.

Currently, we special-case Option here, so some logic will have to be added there to also detect Result where one side is a 1-ZST.

@Lokathor
Copy link
Contributor Author

Lokathor commented May 29, 2024

@saethlin said (via community discord) they would be able to add the additional logic some time soon.

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jun 2, 2024

r? @saethlin perhaps then?

@rustbot rustbot assigned saethlin and unassigned Mark-Simulacrum Jun 2, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 4, 2024

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@saethlin
Copy link
Member

saethlin commented Jun 4, 2024

r? @saethlin perhaps then?

Au contraire, I'm implementing this so I do not think I am a suitable reviewer.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@saethlin saethlin force-pushed the update-miri-result-ffi branch from ff04108 to fe7f3a3 Compare June 4, 2024 04:00
@RalfJung
Copy link
Member

RalfJung commented Jun 4, 2024

r? @RalfJung

@rustbot rustbot assigned RalfJung and unassigned saethlin Jun 4, 2024
RalfJung
RalfJung reviewed Jun 5, 2024
View reviewed changes
Copy link
Member

@RalfJung RalfJung left a comment

Choose a reason for hiding this comment

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

LGTM modulo some comments. r=me after resolving those.

@saethlin saethlin force-pushed the update-miri-result-ffi branch from 7450aeb to b710404 Compare June 5, 2024 13:04
@saethlin
Copy link
Member

saethlin commented Jun 5, 2024

@bors r=RalfJung

@bors
Copy link
Collaborator

bors commented Jun 5, 2024

📌 Commit b710404 has been approved by RalfJung

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 Jun 5, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 5, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 5, 2024
@bors
Auto merge of rust-lang#126038 - matthiaskrgr:rollup-h4rm3x2, r=matth…
72fdf91 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#124840 (resolve: mark it undetermined if single import is not has any bindings)
 - rust-lang#125622 (Winnow private method candidates instead of assuming any candidate of the right name will apply)
 - rust-lang#125648 (Remove unused(?) `~/rustsrc` folder from docker script)
 - rust-lang#125672 (Add more ABI test cases to miri (RFC 3391))
 - rust-lang#125800 (Fix `mut` static task queue in SGX target)
 - rust-lang#125871 (Orphanck[old solver]: Consider opaque types to never cover type parameters)
 - rust-lang#125893 (Handle all GVN binops in a single place.)
 - rust-lang#126008 (Port `tests/run-make-fulldeps/issue-19371` to ui-fulldeps)
 - rust-lang#126032 (Update description of the `IsTerminal` example)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 36cab12 into rust-lang:master Jun 5, 2024
@rustbot rustbot added this to the 1.80.0 milestone Jun 5, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 5, 2024
@rust-timer
Unrolled build for rust-lang#125672
3f73e3e 
Rollup merge of rust-lang#125672 - Lokathor:update-miri-result-ffi, r=RalfJung

Add more ABI test cases to miri (RFC 3391)

Part of rust-lang#110503

cc `@RalfJung`
@fmease
Copy link
Member

fmease commented Jun 6, 2024

bors sleepy @bors r-

@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 Jun 6, 2024
@Lokathor
Copy link
Contributor Author

Lokathor commented Jun 6, 2024

So, wait, did it actually get merged or not?

@RalfJung
Copy link
Member

RalfJung commented Jun 6, 2024

Yeah that is done by github, not bors.

@workingjubilee workingjubilee mentioned this pull request Sep 20, 2024
Closed
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJung RalfJung RalfJung left review comments

Assignees

@RalfJung RalfJung

Labels

S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.80.0

Development

Successfully merging this pull request may close these issues.

8 participants

@Lokathor @rustbot @rust-log-analyzer @RalfJung @Mark-Simulacrum @saethlin @bors @fmease