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

eval_fn_call: check the ABI of body.source #85087

Merged
merged 2 commits into from May 17, 2021
Merged

eval_fn_call: check the ABI of body.source #85087

merged 2 commits into from May 17, 2021

Conversation

ghost
Copy link

@ghost ghost commented May 8, 2021

And stop checking instance_ty.fn_sig(*self.tcx).abi(), if the function is not an intrinsic.
Addresses rust-lang/miri#1776 (comment).
No idea how to test this without Miri...

@ghost ghost changed the title eval_fn_call: check the ABI of body.source [WIP] eval_fn_call: check the ABI of body.source May 8, 2021
@ghost ghost marked this pull request as ready for review May 8, 2021 20:01
@ghost ghost marked this pull request as draft May 8, 2021 20:09
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@ghost ghost closed this May 9, 2021
@ghost ghost reopened this May 9, 2021
@ghost
Copy link
Author

ghost commented May 9, 2021

@ghost ghost changed the title [WIP] eval_fn_call: check the ABI of body.source eval_fn_call: check the ABI of body.source May 9, 2021
@ghost ghost marked this pull request as ready for review May 9, 2021 12:44
@ghost
Copy link
Author

ghost commented May 9, 2021

r? @RalfJung -- I think this adds the check that rust-lang/miri#1776 (comment) describes.
@rustbot label S-waiting-on-review

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 9, 2021
@RalfJung
Copy link
Member

No idea how to test this without Miri...

Yeah, me neither. It looks right though.
Did you test this against Miri master, made sure all tests still pass?

@ghost
Copy link
Author

ghost commented May 17, 2021

Did you test this against Miri master, made sure all tests still pass?

I hadn't, but I just tested it, and they passed:

test result: ok. 281 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in 75.10s

Build completed successfully in 2:09:13

@RalfJung
Copy link
Member

Looking good then, thanks a lot. :)
@bors r+

@bors
Copy link
Contributor

bors commented May 17, 2021

📌 Commit 97bc0ee 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 May 17, 2021
RalfJung added a commit to RalfJung/rust that referenced this pull request May 17, 2021
`eval_fn_call`: check the ABI of `body.source`

And stop checking `instance_ty.fn_sig(*self.tcx).abi()`, if the function is not an intrinsic.
Addresses rust-lang/miri#1776 (comment).
No idea how to test this without Miri...
bors added a commit to rust-lang-ci/rust that referenced this pull request May 17, 2021
Rollup of 8 pull requests

Successful merges:

 - rust-lang#85087 (`eval_fn_call`: check the ABI of `body.source`)
 - rust-lang#85302 (Expand WASI abbreviation in docs)
 - rust-lang#85355 (More tests for issue-85255)
 - rust-lang#85367 (Fix invalid input:disabled CSS selector)
 - rust-lang#85374 (mark internal inplace_iteration traits as hidden)
 - rust-lang#85408 (remove size field from Allocation)
 - rust-lang#85409 (Simplify `cfg(any(unix, target_os="redox"))` in example to just `cfg(unix)`)
 - rust-lang#85412 (remove some functions that were only used by Miri)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b93753e into rust-lang:master May 17, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 17, 2021
@ghost ghost deleted the lots-of-abis branch May 18, 2021 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants