bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #139348 - meithecatte:async-destructor-minify, r=petrochenkov

Browse source 
AsyncDestructor: replace fields with impl_did

The future and ctor fields aren't actually used, and the way they are extracted is obviously wrong – swapping the order of the items in the source code will give wrong results.

Instead, store just the LocalDefId of the impl, which is enough for the only use of this data.
This commit is contained in:
Matthias Krüger 2025-04-04 21:54:58 +02:00 • committed by GitHub
commit d61a4735f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_middle/src/ty/mod.rs
View file

@ -1124,10 +1124,8 @@ pub struct Destructor {
// FIXME: consider combining this definition with regular `Destructor` // FIXME: consider combining this definition with regular `Destructor`
#[derive(Copy, Clone, Debug, HashStable, Encodable, Decodable)] #[derive(Copy, Clone, Debug, HashStable, Encodable, Decodable)]
pub struct AsyncDestructor { pub struct AsyncDestructor {
/// The `DefId` of the async destructor future constructor /// The `DefId` of the `impl AsyncDrop`
pub ctor: DefId, pub impl_did: LocalDefId,
/// The `DefId` of the async destructor future type
pub future: DefId,
} }
#[derive(Clone, Copy, PartialEq, Eq, HashStable, TyEncodable, TyDecodable)] #[derive(Clone, Copy, PartialEq, Eq, HashStable, TyEncodable, TyDecodable)]

2
compiler/rustc_middle/src/ty/significant_drop_order.rs
View file

@ -154,7 +154,7 @@ pub fn ty_dtor_span<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Option<Span> {
let dtor = if let Some(dtor) = tcx.adt_destructor(did) { let dtor = if let Some(dtor) = tcx.adt_destructor(did) {
dtor.did dtor.did
} else if let Some(dtor) = tcx.adt_async_destructor(did) { } else if let Some(dtor) = tcx.adt_async_destructor(did) {
dtor.future return Some(tcx.source_span(dtor.impl_did));
} else { } else {
return Some(try_local_did_span(did)); return Some(try_local_did_span(did));
}; };

15
compiler/rustc_middle/src/ty/util.rs
View file

@ -455,26 +455,17 @@ impl<'tcx> TyCtxt<'tcx> {
continue; continue;
} }
let [future, ctor] = self.associated_item_def_ids(impl_did) else { if let Some(old_impl_did) = dtor_candidate {
self.dcx().span_delayed_bug(
self.def_span(impl_did),
"AsyncDrop impl without async_drop function or Dropper type",
);
continue;
};
if let Some((_, _, old_impl_did)) = dtor_candidate {
self.dcx() self.dcx()
.struct_span_err(self.def_span(impl_did), "multiple async drop impls found") .struct_span_err(self.def_span(impl_did), "multiple async drop impls found")
.with_span_note(self.def_span(old_impl_did), "other impl here") .with_span_note(self.def_span(old_impl_did), "other impl here")
.delay_as_bug(); .delay_as_bug();
} }
dtor_candidate = Some((*future, *ctor, impl_did)); dtor_candidate = Some(impl_did);
} }
let (future, ctor, _) = dtor_candidate?; Some(ty::AsyncDestructor { impl_did: dtor_candidate? })
Some(ty::AsyncDestructor { future, ctor })
} }
/// Returns async drop glue morphology for a definition. To get async drop /// Returns async drop glue morphology for a definition. To get async drop