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

Add ABI argument to find_mir_or_eval_fn #80878

Merged
merged 1 commit into from
Jan 11, 2021
Merged

Add ABI argument to find_mir_or_eval_fn #80878

merged 1 commit into from
Jan 11, 2021

Conversation

unseddd
Copy link

@unseddd unseddd commented Jan 10, 2021

Add ABI argument for called function in find_mir_or_eval_fn and
call_extra_fn. Useful for comparing with expected ABI in interpreters.

Related to miri/1631

r? @RalfJung

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @RalfJung (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 10, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
Add ABI argument to find_mir_or_eval_fn
06fd212 
Add ABI argument for called function in `find_mir_or_eval_fn` and
`call_extra_fn`. Useful for comparing with expected ABI in interpreters.

Related to [miri/1631](rust-lang/miri#1631)
@RalfJung
Copy link
Member

@unseddd thanks a lot, this looks great. :)
@bors r+ rollup

When this lands, Miri will fail to build. Do you think you can prepare a PR that just makes Miri build again, without actually using the new arguments? That way Miri is not blocked on completing this work.
This part of the Miri contrib guide is relevant here.

@bors
Copy link
Contributor

bors commented Jan 10, 2021

📌 Commit 06fd212 has been approved by RalfJung

@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 Jan 10, 2021
@JohnTitor JohnTitor mentioned this pull request Jan 11, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 11, 2021
@bors
Auto merge of rust-lang#80905 - JohnTitor:rollup-tmmwmnb, r=JohnTitor
a2cd91c 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#80809 (Use standard formatting for "rust-call" ABI message)
 - rust-lang#80872 (Fix typo in source-based-code-coverage.md)
 - rust-lang#80878 (Add ABI argument to `find_mir_or_eval_fn`)
 - rust-lang#80881 ( Fix intra-doc links to `Self` and `crate` )
 - rust-lang#80887 (log-color: Detect TTY based on stderr, not stdout)
 - rust-lang#80892 (rustdoc: Remove `*` intra-doc alias for `pointer`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 95a6279 into rust-lang:master Jan 11, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 11, 2021
@JohnTitor JohnTitor mentioned this pull request Jan 11, 2021
Closed
@RalfJung
Copy link
Member

When this lands, Miri will fail to build. Do you think you can prepare a PR that just makes Miri build again, without actually using the new arguments? That way Miri is not blocked on completing this work.

Ah, that landed quicker than I expected.
To get Miri to build again and avoid stacking up breakage, I'll do this fix, since it's rather easy for me. I'll leave the actual ABI check change to you of course. :)

@unseddd
Copy link
Author

unseddd commented Jan 11, 2021

Ah, that landed quicker than I expected.
To get Miri to build again and avoid stacking up breakage, I'll do this fix, since it's rather easy for me. I'll leave the actual ABI check change to you of course. :)

I was surprised by the speed, too 😄

Started working on the build fix, which is a nice intro, anyway. Will focus on the actual ABI check, and pull down your changes before making a PR.

@RalfJung
Copy link
Member

Started working on the build fix, which is a nice intro, anyway.

True. :) So if you want to take this as an "exercise", go ahead. :D You can find the "solution" at rust-lang/miri#1669.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@RalfJung RalfJung

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.51.0
Development

Successfully merging this pull request may close these issues.
6 participants
@unseddd @rust-highfive @rust-log-analyzer @RalfJung @bors @rustbot