Skip to content

Commit

Permalink
Unrolled build for rust-lang#125513
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#125513 - compiler-errors:impossible-drop, r=jackh726

Don't eagerly monomorphize drop for types that are impossible to instantiate

Self-explanatory title I think

Fixes rust-lang#125509
  • Loading branch information
rust-timer committed May 25, 2024
2 parents 77d4115 + 045f448 commit 63b6542
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
9 changes: 9 additions & 0 deletions compiler/rustc_monomorphize/src/collector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1434,6 +1434,15 @@ impl<'v> RootCollector<'_, 'v> {
{
debug!("RootCollector: ADT drop-glue for `{id:?}`",);

// This type is impossible to instantiate, so we should not try to
// generate a `drop_in_place` instance for it.
if self.tcx.instantiate_and_check_impossible_predicates((
id.owner_id.to_def_id(),
ty::List::empty(),
)) {
return;
}

let ty = self.tcx.type_of(id.owner_id.to_def_id()).no_bound_vars().unwrap();
visit_drop_use(self.tcx, ty, true, DUMMY_SP, self.output);
}
Expand Down
18 changes: 18 additions & 0 deletions tests/ui/codegen/mono-impossible-drop.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//@ compile-flags: -Clink-dead-code=on --crate-type=lib
//@ build-pass

#![feature(trivial_bounds)]
#![allow(trivial_bounds)]

// Make sure we don't monomorphize the drop impl for `Baz`, since it has predicates
// that don't hold under a reveal-all param env.

trait Foo {
type Assoc;
}

struct Bar;

struct Baz(<Bar as Foo>::Assoc)
where
Bar: Foo;

0 comments on commit 63b6542

Please sign in to comment.