-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #135042 - lukas-code:taint-dyn-incompat, r=compiler-e…
…rrors taint fcx on selection errors during unsizing With `feature(dyn_compatible_for_dispatch)` we only check for dyn-compatibility by checking the `T: Unsize<dyn Trait>` predicate during the unsizing coercions checks. If the predicate doesn't hold, we emit an error, but pretend the coercion succeeded to prevent further errors. To prevent const eval from attempting to actually perform this coercion, we need to taint the fcx after reporting the trait errors in the coercion check. fixes #135021 fixes #130521
- Loading branch information
Showing
5 changed files
with
119 additions
and
14 deletions.
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 was deleted.
Oops, something went wrong.
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,71 @@ | ||
error[E0038]: the trait `Qux` cannot be made into an object | ||
--> $DIR/taint-const-eval.rs:11:15 | ||
| | ||
LL | static FOO: &(dyn Qux + Sync) = "desc"; | ||
| ^^^^^^^^^^^^^^ `Qux` cannot be made into an object | ||
| | ||
note: for a trait to be "dyn-compatible" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety> | ||
--> $DIR/taint-const-eval.rs:8:8 | ||
| | ||
LL | trait Qux { | ||
| --- this trait cannot be made into an object... | ||
LL | fn bar(); | ||
| ^^^ ...because associated function `bar` has no `self` parameter | ||
help: consider turning `bar` into a method by giving it a `&self` argument | ||
| | ||
LL | fn bar(&self); | ||
| +++++ | ||
help: alternatively, consider constraining `bar` so it does not apply to trait objects | ||
| | ||
LL | fn bar() where Self: Sized; | ||
| +++++++++++++++++ | ||
|
||
error[E0038]: the trait `Qux` cannot be made into an object | ||
--> $DIR/taint-const-eval.rs:11:33 | ||
| | ||
LL | static FOO: &(dyn Qux + Sync) = "desc"; | ||
| ^^^^^^ `Qux` cannot be made into an object | ||
| | ||
note: for a trait to be "dyn-compatible" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety> | ||
--> $DIR/taint-const-eval.rs:8:8 | ||
| | ||
LL | trait Qux { | ||
| --- this trait cannot be made into an object... | ||
LL | fn bar(); | ||
| ^^^ ...because associated function `bar` has no `self` parameter | ||
= note: required for the cast from `&'static str` to `&'static (dyn Qux + Sync + 'static)` | ||
help: consider turning `bar` into a method by giving it a `&self` argument | ||
| | ||
LL | fn bar(&self); | ||
| +++++ | ||
help: alternatively, consider constraining `bar` so it does not apply to trait objects | ||
| | ||
LL | fn bar() where Self: Sized; | ||
| +++++++++++++++++ | ||
|
||
error[E0038]: the trait `Qux` cannot be made into an object | ||
--> $DIR/taint-const-eval.rs:11:15 | ||
| | ||
LL | static FOO: &(dyn Qux + Sync) = "desc"; | ||
| ^^^^^^^^^^^^^^ `Qux` cannot be made into an object | ||
| | ||
note: for a trait to be "dyn-compatible" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety> | ||
--> $DIR/taint-const-eval.rs:8:8 | ||
| | ||
LL | trait Qux { | ||
| --- this trait cannot be made into an object... | ||
LL | fn bar(); | ||
| ^^^ ...because associated function `bar` has no `self` parameter | ||
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no` | ||
help: consider turning `bar` into a method by giving it a `&self` argument | ||
| | ||
LL | fn bar(&self); | ||
| +++++ | ||
help: alternatively, consider constraining `bar` so it does not apply to trait objects | ||
| | ||
LL | fn bar() where Self: Sized; | ||
| +++++++++++++++++ | ||
|
||
error: aborting due to 3 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0038`. |
26 changes: 26 additions & 0 deletions
26
tests/ui/dyn-compatibility/taint-const-eval.dyn_compatible_for_dispatch.stderr
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,26 @@ | ||
error[E0038]: the trait `Qux` cannot be made into an object | ||
--> $DIR/taint-const-eval.rs:11:33 | ||
| | ||
LL | static FOO: &(dyn Qux + Sync) = "desc"; | ||
| ^^^^^^ `Qux` cannot be made into an object | ||
| | ||
note: for a trait to be "dyn-compatible" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety> | ||
--> $DIR/taint-const-eval.rs:8:8 | ||
| | ||
LL | trait Qux { | ||
| --- this trait cannot be made into an object... | ||
LL | fn bar(); | ||
| ^^^ ...because associated function `bar` has no `self` parameter | ||
= note: required for the cast from `&'static str` to `&'static (dyn Qux + Sync + 'static)` | ||
help: consider turning `bar` into a method by giving it a `&self` argument | ||
| | ||
LL | fn bar(&self); | ||
| +++++ | ||
help: alternatively, consider constraining `bar` so it does not apply to trait objects | ||
| | ||
LL | fn bar() where Self: Sized; | ||
| +++++++++++++++++ | ||
|
||
error: aborting due to 1 previous error | ||
|
||
For more information about this error, try `rustc --explain E0038`. |
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,16 @@ | ||
// Test that we do not attempt to create dyn-incompatible trait objects in const eval. | ||
|
||
//@ revisions: curr dyn_compatible_for_dispatch | ||
|
||
#![cfg_attr(dyn_compatible_for_dispatch, feature(dyn_compatible_for_dispatch))] | ||
|
||
trait Qux { | ||
fn bar(); | ||
} | ||
|
||
static FOO: &(dyn Qux + Sync) = "desc"; | ||
//~^ the trait `Qux` cannot be made into an object | ||
//[curr]~| the trait `Qux` cannot be made into an object | ||
//[curr]~| the trait `Qux` cannot be made into an object | ||
|
||
fn main() {} |