diff options
| author | bors <bors@rust-lang.org> | 2020-09-20 04:15:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-09-20 04:15:43 +0000 |
| commit | a3bc0e752fad96f537b73f4e9bc805a73d404f7b (patch) | |
| tree | 0c1e237df2c2e814a31fcc81c8c81cdbcdafc69a /src | |
| parent | 255a4c58f5863ed41c2e68792799125c6c676575 (diff) | |
| parent | f8376b59d1391a5191a561c44067355f1a99c7c0 (diff) | |
| download | rust-a3bc0e752fad96f537b73f4e9bc805a73d404f7b.tar.gz rust-a3bc0e752fad96f537b73f4e9bc805a73d404f7b.zip | |
Auto merge of #75346 - davidtwco:issue-69925-polymorphic-instancedef-fnptrshim, r=nikomatsakis
shim: monomorphic `FnPtrShim`s during construction Fixes #69925. This PR adjusts MIR shim construction so that substitutions are applied to function pointer shims during construction, rather than during codegen (as determined by `substs_for_mir_body`). r? `@eddyb`
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/mir-opt/fn_ptr_shim.core.ops-function-Fn-call.AddMovesForPackedDrops.before.mir | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/mir-opt/fn_ptr_shim.core.ops-function-Fn-call.AddMovesForPackedDrops.before.mir b/src/test/mir-opt/fn_ptr_shim.core.ops-function-Fn-call.AddMovesForPackedDrops.before.mir index d3f92d389f5..bcc6042f2fb 100644 --- a/src/test/mir-opt/fn_ptr_shim.core.ops-function-Fn-call.AddMovesForPackedDrops.before.mir +++ b/src/test/mir-opt/fn_ptr_shim.core.ops-function-Fn-call.AddMovesForPackedDrops.before.mir @@ -1,7 +1,7 @@ // MIR for `std::ops::Fn::call` before AddMovesForPackedDrops -fn std::ops::Fn::call(_1: *const fn(), _2: Args) -> <Self as FnOnce<Args>>::Output { - let mut _0: <Self as std::ops::FnOnce<Args>>::Output; // return place in scope 0 at $SRC_DIR/core/src/ops/function.rs:LL:COL +fn std::ops::Fn::call(_1: *const fn(), _2: ()) -> <fn() as FnOnce<()>>::Output { + let mut _0: <fn() as std::ops::FnOnce<()>>::Output; // return place in scope 0 at $SRC_DIR/core/src/ops/function.rs:LL:COL bb0: { _0 = move (*_1)() -> bb1; // scope 0 at $SRC_DIR/core/src/ops/function.rs:LL:COL |