Handle recursive instantiation of drop shims #67731
Merged
Conversation
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
|
r? @zackmdavis (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @eddyb since they reviewed the PR that introduced this. |
eddyb
reviewed
Jan 16, 2020
| @@ -434,7 +434,7 @@ fn check_recursion_limit<'tcx>( | |||
| // Code that needs to instantiate the same function recursively | |||
| // more than the recursion limit is assumed to be causing an | |||
| // infinite expansion. | |||
| if recursion_depth > *tcx.sess.recursion_limit.get() { | |||
| if adjusted_recursion_depth > *tcx.sess.recursion_limit.get() { | |||
| let error = format!("reached the recursion limit while instantiating `{}`", instance); | |||
| if let Some(hir_id) = tcx.hir().as_local_hir_id(def_id) { | |||
| tcx.sess.span_fatal(tcx.hir().span(hir_id), &error); | |||
There was a problem hiding this comment.
I feel like we should just search for hir().span and replace as many of them as possible...
(this should be tcx.def_span(def_id) and not check for def_id being local, but always use span_fatal).
|
@bors r+ |
|
📌 Commit 4843f22 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jan 17, 2020
Handle recursive instantiation of drop shims The compiler used to hang because the recursion limit was never hit.
|
☀️ Test successful - checks-azure |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Jan 17, 2020
Tested on commit rust-lang/rust@91ff7c6. Direct link to PR: <rust-lang/rust#67731> 💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The compiler used to hang because the recursion limit was never hit.