forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
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 rust-lang#123005 - maurer:cfi-arbitrary-receivers, r=…
…compiler-errors CFI: Support complex receivers Right now, we only support rewriting `&self` and `&mut self` into `&dyn MyTrait` and `&mut dyn MyTrait`. This expands it to handle the full gamut of receivers by calculating the receiver based on *substitution* rather than based on a rewrite. This means that, for example, `Arc<Self>` will become `Arc<dyn MyTrait>` appropriately with this change. This approach also allows us to support associated type constraints as well, so we will correctly rewrite `&self` into `&dyn MyTrait<T=i32>`, for example. r? `@workingjubilee`
- Loading branch information
Showing
5 changed files
with
115 additions
and
39 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 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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
// Check that more complex receivers work: | ||
// * Arc<dyn Foo> as for custom receivers | ||
// * &dyn Bar<T=Baz> for type constraints | ||
|
||
//@ needs-sanitizer-cfi | ||
// FIXME(#122848) Remove only-linux once OSX CFI binaries work | ||
//@ only-linux | ||
//@ compile-flags: --crate-type=bin -Cprefer-dynamic=off -Clto -Zsanitizer=cfi | ||
//@ compile-flags: -C target-feature=-crt-static -C codegen-units=1 -C opt-level=0 | ||
//@ run-pass | ||
|
||
use std::sync::Arc; | ||
|
||
trait Foo { | ||
fn foo(self: Arc<Self>); | ||
} | ||
|
||
struct FooImpl; | ||
|
||
impl Foo for FooImpl { | ||
fn foo(self: Arc<Self>) {} | ||
} | ||
|
||
trait Bar { | ||
type T; | ||
fn bar(&self) -> Self::T; | ||
} | ||
|
||
struct BarImpl; | ||
|
||
impl Bar for BarImpl { | ||
type T = i32; | ||
fn bar(&self) -> Self::T { 7 } | ||
} | ||
|
||
fn main() { | ||
let foo: Arc<dyn Foo> = Arc::new(FooImpl); | ||
foo.foo(); | ||
|
||
let bar: &dyn Bar<T=i32> = &BarImpl; | ||
assert_eq!(bar.bar(), 7); | ||
} |