Skip to content

Commit 1e485f1

Browse files
committed
Fix rustc tests
1 parent a07fd93 commit 1e485f1

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

scripts/test_rustc_tests.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ rm tests/incremental/hashes/statics.rs # same
4444
rm tests/ui/abi/mir/mir_codegen_calls_variadic.rs # requires float varargs
4545
rm tests/ui/abi/variadic-ffi.rs # requires callee side vararg support
4646
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
4748

4849
# unsized locals
4950
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
120121
# bugs in the test suite
121122
# ======================
122123
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
123125

124126
rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
125127

src/abi/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ pub(crate) fn codegen_terminator_call<'tcx>(
412412
Err(instance) => Some(instance),
413413
}
414414
}
415-
InstanceDef::DropGlue(_, None) => {
415+
InstanceDef::DropGlue(_, None) | ty::InstanceDef::AsyncDropGlueCtorShim(_, None) => {
416416
// empty drop glue - a nop.
417417
let dest = target.expect("Non terminating drop_in_place_real???");
418418
let ret_block = fx.get_block(dest);
@@ -597,7 +597,9 @@ pub(crate) fn codegen_drop<'tcx>(
597597
let ty = drop_place.layout().ty;
598598
let drop_instance = Instance::resolve_drop_in_place(fx.tcx, ty).polymorphize(fx.tcx);
599599

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+
{
601603
// we don't actually need to drop anything
602604
} else {
603605
match ty.kind() {

0 commit comments

Comments
 (0)