-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Get rid of special const intrinsic query in favour of const_eval
#61626
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
r=me with comment added (or moving more intrinsics)
☔ The latest upstream changes (presumably #61722) made this pull request unmergeable. Please resolve the merge conflicts. |
34daa8f
to
26c486f
Compare
I ported the rest of the zero arg intrinsics and thus also deduplicated their implementation between const eval and codegen |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
r=me
src/librustc_mir/const_eval.rs
Outdated
tcx.const_eval_raw(key).and_then(|val| { | ||
validate_and_turn_into_const(tcx, val, key) | ||
}) | ||
} | ||
|
||
fn eval_intrinsic<'tcx>( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you rename this to eval_nulary_intrinsic
?
@bors r=eddyb |
📌 Commit f361410 has been approved by |
Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb
💔 Test failed - checks-travis |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
f361410
to
e214d29
Compare
Uh, even after a rebase I can't repro the failure locally even though it totally looks related. Not sure what is going on. Are there any flags (like |
The CI failue is for |
This comment has been minimized.
This comment has been minimized.
Nevermind, builds other than |
☔ The latest upstream changes (presumably #62355) made this pull request unmergeable. Please resolve the merge conflicts. |
e214d29
to
ffd0335
Compare
☔ The latest upstream changes (presumably #62902) made this pull request unmergeable. Please resolve the merge conflicts. |
ff654b8
to
039947d
Compare
@bors r=eddyb |
📌 Commit 36e2da650b9667b5ac0def6a0d0e0e62265e5404 has been approved by |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
PR builder failed, @bors r- |
36e2da6
to
0de9485
Compare
I forgot to rebase and ui tests changed on master. @bors r=eddyb |
📌 Commit 0de9485 has been approved by |
Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb
Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb
Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb
Rollup of 10 pull requests Successful merges: - #61626 (Get rid of special const intrinsic query in favour of `const_eval`) - #64283 (Updated RELEASES.md for 1.38.0) - #64394 (Shrink `SubregionOrigin`.) - #64429 (Fix failure note `to_str` implementation) - #64436 (improve Vec example soundness in mem::transmute docs) - #64502 (avoid duplicate issues for Miri build failures) - #64505 (Fix inconsistent link formatting) - #64529 (Add an example to Pin::as_mut) - #64541 (document Miri error categories) - #64544 (build-manifest: re-add some comments) Failed merges: r? @ghost
Why did bors try to test this after the rollup has been successful? |
That's a known bug in bors. Not sure if it is tracked anywhere though (you could ask in the infra channel on Discord). |
:)
Dont have a discord account |
r? @eddyb