-
Notifications
You must be signed in to change notification settings - Fork 13.2k
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
Check for unbounded recursion during dropck #22777
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
37 changes: 37 additions & 0 deletions
37
src/test/compile-fail/dropck_no_diverge_on_nonregular_1.rs
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // Copyright 2015 The Rust Project Developers. See the COPYRIGHT | ||
| // file at the top-level directory of this distribution and at | ||
| // http://rust-lang.org/COPYRIGHT. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
| // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
| // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
| // option. This file may not be copied, modified, or distributed | ||
| // except according to those terms. | ||
|
|
||
| // Issue 22443: Reject code using non-regular types that would | ||
| // otherwise cause dropck to loop infinitely. | ||
|
|
||
| use std::marker::PhantomData; | ||
|
|
||
| struct Digit<T> { | ||
| elem: T | ||
| } | ||
|
|
||
| struct Node<T:'static> { m: PhantomData<&'static T> } | ||
|
|
||
|
|
||
| enum FingerTree<T:'static> { | ||
| Single(T), | ||
| // Bug report said Digit after Box would stack overflow (versus | ||
| // Digit before Box; see dropck_no_diverge_on_nonregular_2). | ||
| Deep( | ||
| Box<FingerTree<Node<T>>>, | ||
| Digit<T>, | ||
| ) | ||
| } | ||
|
|
||
| fn main() { | ||
| let ft = //~ ERROR overflow while adding drop-check rules for FingerTree | ||
| FingerTree::Single(1); | ||
| //~^ ERROR overflow while adding drop-check rules for FingerTree | ||
| } |
36 changes: 36 additions & 0 deletions
36
src/test/compile-fail/dropck_no_diverge_on_nonregular_2.rs
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // Copyright 2015 The Rust Project Developers. See the COPYRIGHT | ||
| // file at the top-level directory of this distribution and at | ||
| // http://rust-lang.org/COPYRIGHT. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
| // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
| // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
| // option. This file may not be copied, modified, or distributed | ||
| // except according to those terms. | ||
|
|
||
| // Issue 22443: Reject code using non-regular types that would | ||
| // otherwise cause dropck to loop infinitely. | ||
|
|
||
| use std::marker::PhantomData; | ||
|
|
||
| struct Digit<T> { | ||
| elem: T | ||
| } | ||
|
|
||
| struct Node<T:'static> { m: PhantomData<&'static T> } | ||
|
|
||
| enum FingerTree<T:'static> { | ||
| Single(T), | ||
| // Bug report said Digit before Box would infinite loop (versus | ||
| // Digit after Box; see dropck_no_diverge_on_nonregular_1). | ||
| Deep( | ||
| Digit<T>, | ||
| Box<FingerTree<Node<T>>>, | ||
| ) | ||
| } | ||
|
|
||
| fn main() { | ||
| let ft = //~ ERROR overflow while adding drop-check rules for FingerTree | ||
| FingerTree::Single(1); | ||
| //~^ ERROR overflow while adding drop-check rules for FingerTree | ||
| } | ||
46 changes: 46 additions & 0 deletions
46
src/test/compile-fail/dropck_no_diverge_on_nonregular_3.rs
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // Copyright 2015 The Rust Project Developers. See the COPYRIGHT | ||
| // file at the top-level directory of this distribution and at | ||
| // http://rust-lang.org/COPYRIGHT. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
| // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
| // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
| // option. This file may not be copied, modified, or distributed | ||
| // except according to those terms. | ||
|
|
||
| // Issue 22443: Reject code using non-regular types that would | ||
| // otherwise cause dropck to loop infinitely. | ||
| // | ||
| // This version is just checking that we still sanely handle a trivial | ||
| // wrapper around the non-regular type. (It also demonstrates how the | ||
| // error messages will report different types depending on which type | ||
| // dropck is analyzing.) | ||
|
|
||
| use std::marker::PhantomData; | ||
|
|
||
| struct Digit<T> { | ||
| elem: T | ||
| } | ||
|
|
||
| struct Node<T:'static> { m: PhantomData<&'static T> } | ||
|
|
||
| enum FingerTree<T:'static> { | ||
| Single(T), | ||
| // According to the bug report, Digit before Box would infinite loop. | ||
| Deep( | ||
| Digit<T>, | ||
| Box<FingerTree<Node<T>>>, | ||
| ) | ||
| } | ||
|
|
||
| enum Wrapper<T:'static> { | ||
| Simple, | ||
| Other(FingerTree<T>), | ||
| } | ||
|
|
||
| fn main() { | ||
| let w = //~ ERROR overflow while adding drop-check rules for core::option | ||
| Some(Wrapper::Simple::<u32>); | ||
| //~^ ERROR overflow while adding drop-check rules for core::option::Option | ||
| //~| ERROR overflow while adding drop-check rules for Wrapper | ||
| } |
Oops, something went wrong.
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.
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.
what is the difference between this and the first test?
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.
the comment below says why. (The bug report observed different behaviors, both bad, depending on the order of Digit versus Box)
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.
I see, I think it'd be helpful to write in the comment something like "In contrast to Digit after Box, which is the other test."
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.
Okay, will do