File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -44,6 +44,7 @@ rm tests/incremental/hashes/statics.rs # same
44
44
rm tests/ui/abi/mir/mir_codegen_calls_variadic.rs # requires float varargs
45
45
rm tests/ui/abi/variadic-ffi.rs # requires callee side vararg support
46
46
rm -r tests/run-make/c-link-to-rust-va-list-fn # requires callee side vararg support
47
+ rm tests/ui/delegation/fn-header.rs
47
48
48
49
# unsized locals
49
50
rm -r tests/run-pass-valgrind/unsized-locals
@@ -120,6 +121,7 @@ rm -r tests/run-make/panic-abort-eh_frame # .eh_frame emitted with panic=abort
120
121
# bugs in the test suite
121
122
# ======================
122
123
rm tests/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
124
+ rm tests/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs # TODO some symbol not being found, but works fine when manually invoked
123
125
124
126
rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
125
127
Original file line number Diff line number Diff line change @@ -412,7 +412,7 @@ pub(crate) fn codegen_terminator_call<'tcx>(
412
412
Err ( instance) => Some ( instance) ,
413
413
}
414
414
}
415
- InstanceDef :: DropGlue ( _, None ) => {
415
+ InstanceDef :: DropGlue ( _, None ) | ty :: InstanceDef :: AsyncDropGlueCtorShim ( _ , None ) => {
416
416
// empty drop glue - a nop.
417
417
let dest = target. expect ( "Non terminating drop_in_place_real???" ) ;
418
418
let ret_block = fx. get_block ( dest) ;
@@ -597,7 +597,9 @@ pub(crate) fn codegen_drop<'tcx>(
597
597
let ty = drop_place. layout ( ) . ty ;
598
598
let drop_instance = Instance :: resolve_drop_in_place ( fx. tcx , ty) . polymorphize ( fx. tcx ) ;
599
599
600
- if let ty:: InstanceDef :: DropGlue ( _, None ) = drop_instance. def {
600
+ if let ty:: InstanceDef :: DropGlue ( _, None ) | ty:: InstanceDef :: AsyncDropGlueCtorShim ( _, None ) =
601
+ drop_instance. def
602
+ {
601
603
// we don't actually need to drop anything
602
604
} else {
603
605
match ty. kind ( ) {
You can’t perform that action at this time.
0 commit comments