Use recursion_limit for const eval stack limit#66726
Merged
bors merged 1 commit intorust-lang:masterfrom Dec 1, 2019
Merged
Conversation
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
CAD97
force-pushed
the
miri-recursion-limit
branch
from
72ceae3 to
feb35d4
Compare
Contributor
Author
|
(I just want to note that apparently I am failing at git/rebase currently, so the commit is weird and misbehaving.) |
CAD97
force-pushed
the
miri-recursion-limit
branch
2 times, most recently
from
1116b09 to
69a13f2
Compare
Contributor
Author
|
(There, commit should be fixed.) |
CAD97
force-pushed
the
miri-recursion-limit
branch
from
69a13f2 to
0aebfc8
Compare
Contributor
|
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 |
Member
|
Looks like you will have to adjust some UI tests. The approach LGTM, but I'd also like to hear @oli-obk's opinion. |
Contributor
|
r? @oli-obk then |
Contributor
Author
oli-obk
reviewed
Nov 26, 2019
Contributor
|
lgtm modulo tests |
oli-obk
added
S-waiting-on-author
CAD97
force-pushed
the
miri-recursion-limit
branch
from
0af8b0d to
52426ab
Compare
Contributor
Author
|
I believe other changes caused the two failing UI tests to output a recursive requirement warning rather than a depth limit exceeded, so the tests don't need updating anymore. I did manage to get "most" of a bless run done. EDIT: found the change: #66294 |
Member
|
@bors r+ |
Collaborator
|
📌 Commit 52426ab has been approved by |
Collaborator
|
🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 1, 2019
Use recursion_limit for const eval stack limit cc rust-lang/miri#643 @orium @RalfJung I'm really not certain how exactly to handle this change, but it looks like it's that simple. Reuse `recursion_limit` ("The maximum recursion limit for potentially infinitely recursive operations such as auto-dereference and monomorphization") which is configurable by the user for the const evaluation stack frame limit. The other option is to make `const_eval_stack_frame_limit` configurable in the same way as `recursion_limit` (but I'm not sure how to do that and it'd be a bigger change). Fixes rust-lang/miri#643.
bors
added a commit
that referenced
this pull request
Dec 1, 2019
Rollup of 9 pull requests Successful merges: - #66503 (More useful test error messages on should_panic(expected=...) mismatch) - #66662 (Miri: run panic-catching tests in liballoc) - #66679 (Improve lifetime errors with implicit trait object lifetimes) - #66726 (Use recursion_limit for const eval stack limit) - #66790 (Do `min_const_fn` checks for `SetDiscriminant`s target) - #66832 (const_prop: detect and avoid catching Miri errors that require allocation) - #66880 (Add long error code explanation message for E0203) - #66890 (Format liballoc with rustfmt) - #66896 (pass Queries to compiler callbacks) Failed merges: r? @ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cc rust-lang/miri#643 @orium @RalfJung
I'm really not certain how exactly to handle this change, but it looks like it's that simple.
Reuse
recursion_limit("The maximum recursion limit for potentially infinitely recursive operations such as auto-dereference and monomorphization") which is configurable by the user for the const evaluation stack frame limit.The other option is to make
const_eval_stack_frame_limitconfigurable in the same way asrecursion_limit(but I'm not sure how to do that and it'd be a bigger change).Fixes rust-lang/miri#643.