Skip to content

Commit a21ba34

Browse files
compiler-errorscompiler-errors
committed
add TyCtxt::as_lang_item, use in new solver
1 parent 49ff390 commit a21ba34

File tree

5 files changed

+126
-75
lines changed

5 files changed

+126
-75
lines changed

‎compiler/rustc_hir/src/lang_items.rs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use crate::def_id::DefId;
1111
use crate::{MethodKind, Target};
1212

1313
use rustc_ast as ast;
14+
use rustc_data_structures::fx::FxIndexMap;
1415
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
1516
use rustc_macros::{Decodable, Encodable, HashStable_Generic};
1617
use rustc_span::symbol::{kw, sym, Symbol};
@@ -23,14 +24,19 @@ pub struct LanguageItems {
2324
/// Mappings from lang items to their possibly found [`DefId`]s.
2425
/// The index corresponds to the order in [`LangItem`].
2526
items: [Option<DefId>; std::mem::variant_count::<LangItem>()],
27+
reverse_items: FxIndexMap<DefId, LangItem>,
2628
/// Lang items that were not found during collection.
2729
pub missing: Vec<LangItem>,
2830
}
2931

3032
impl LanguageItems {
3133
/// Construct an empty collection of lang items and no missing ones.
3234
pub fn new() -> Self {
33-
Self { items: [None; std::mem::variant_count::<LangItem>()], missing: Vec::new() }
35+
Self {
36+
items: [None; std::mem::variant_count::<LangItem>()],
37+
reverse_items: FxIndexMap::default(),
38+
missing: Vec::new(),
39+
}
3440
}
3541

3642
pub fn get(&self, item: LangItem) -> Option<DefId> {
@@ -39,6 +45,11 @@ impl LanguageItems {
3945

4046
pub fn set(&mut self, item: LangItem, def_id: DefId) {
4147
self.items[item as usize] = Some(def_id);
48+
self.reverse_items.insert(def_id, item);
49+
}
50+
51+
pub fn from_def_id(&self, def_id: DefId) -> Option<LangItem> {
52+
self.reverse_items.get(&def_id).copied()
4253
}
4354

4455
pub fn iter(&self) -> impl Iterator<Item = (LangItem, DefId)> + '_ {

‎compiler/rustc_middle/src/middle/lang_items.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ impl<'tcx> TyCtxt<'tcx> {
2727
self.lang_items().get(lang_item) == Some(def_id)
2828
}
2929

30+
pub fn as_lang_item(self, def_id: DefId) -> Option<LangItem> {
31+
self.lang_items().from_def_id(def_id)
32+
}
33+
3034
/// Given a [`DefId`] of one of the [`Fn`], [`FnMut`] or [`FnOnce`] traits,
3135
/// returns a corresponding [`ty::ClosureKind`].
3236
/// For any other [`DefId`] return `None`.

‎compiler/rustc_middle/src/ty/context.rs‎

Lines changed: 58 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,10 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
366366
self.is_lang_item(def_id, trait_lang_item_to_lang_item(lang_item))
367367
}
368368

369+
fn as_lang_item(self, def_id: DefId) -> Option<TraitSolverLangItem> {
370+
lang_item_to_trait_lang_item(self.lang_items().from_def_id(def_id)?)
371+
}
372+
369373
fn associated_type_def_ids(self, def_id: DefId) -> impl IntoIterator<Item = DefId> {
370374
self.associated_items(def_id)
371375
.in_definition_order()
@@ -584,46 +588,63 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
584588
}
585589
}
586590

587-
fn trait_lang_item_to_lang_item(lang_item: TraitSolverLangItem) -> LangItem {
588-
match lang_item {
589-
TraitSolverLangItem::AsyncDestruct => LangItem::AsyncDestruct,
590-
TraitSolverLangItem::AsyncFnKindHelper => LangItem::AsyncFnKindHelper,
591-
TraitSolverLangItem::AsyncFnKindUpvars => LangItem::AsyncFnKindUpvars,
592-
TraitSolverLangItem::AsyncFnOnceOutput => LangItem::AsyncFnOnceOutput,
593-
TraitSolverLangItem::AsyncIterator => LangItem::AsyncIterator,
594-
TraitSolverLangItem::CallOnceFuture => LangItem::CallOnceFuture,
595-
TraitSolverLangItem::CallRefFuture => LangItem::CallRefFuture,
596-
TraitSolverLangItem::Clone => LangItem::Clone,
597-
TraitSolverLangItem::Copy => LangItem::Copy,
598-
TraitSolverLangItem::Coroutine => LangItem::Coroutine,
599-
TraitSolverLangItem::CoroutineReturn => LangItem::CoroutineReturn,
600-
TraitSolverLangItem::CoroutineYield => LangItem::CoroutineYield,
601-
TraitSolverLangItem::Destruct => LangItem::Destruct,
602-
TraitSolverLangItem::DiscriminantKind => LangItem::DiscriminantKind,
603-
TraitSolverLangItem::DynMetadata => LangItem::DynMetadata,
604-
TraitSolverLangItem::EffectsMaybe => LangItem::EffectsMaybe,
605-
TraitSolverLangItem::EffectsIntersection => LangItem::EffectsIntersection,
606-
TraitSolverLangItem::EffectsIntersectionOutput => LangItem::EffectsIntersectionOutput,
607-
TraitSolverLangItem::EffectsNoRuntime => LangItem::EffectsNoRuntime,
608-
TraitSolverLangItem::EffectsRuntime => LangItem::EffectsRuntime,
609-
TraitSolverLangItem::FnPtrTrait => LangItem::FnPtrTrait,
610-
TraitSolverLangItem::FusedIterator => LangItem::FusedIterator,
611-
TraitSolverLangItem::Future => LangItem::Future,
612-
TraitSolverLangItem::FutureOutput => LangItem::FutureOutput,
613-
TraitSolverLangItem::Iterator => LangItem::Iterator,
614-
TraitSolverLangItem::Metadata => LangItem::Metadata,
615-
TraitSolverLangItem::Option => LangItem::Option,
616-
TraitSolverLangItem::PointeeTrait => LangItem::PointeeTrait,
617-
TraitSolverLangItem::PointerLike => LangItem::PointerLike,
618-
TraitSolverLangItem::Poll => LangItem::Poll,
619-
TraitSolverLangItem::Sized => LangItem::Sized,
620-
TraitSolverLangItem::TransmuteTrait => LangItem::TransmuteTrait,
621-
TraitSolverLangItem::Tuple => LangItem::Tuple,
622-
TraitSolverLangItem::Unpin => LangItem::Unpin,
623-
TraitSolverLangItem::Unsize => LangItem::Unsize,
591+
macro_rules! bidirectional_lang_item_map {
592+
($($name:ident),+ $(,)?) => {
593+
fn trait_lang_item_to_lang_item(lang_item: TraitSolverLangItem) -> LangItem {
594+
match lang_item {
595+
$(TraitSolverLangItem::$name => LangItem::$name,)+
596+
}
597+
}
598+
599+
fn lang_item_to_trait_lang_item(lang_item: LangItem) -> Option<TraitSolverLangItem> {
600+
Some(match lang_item {
601+
$(LangItem::$name => TraitSolverLangItem::$name,)+
602+
_ => return None,
603+
})
604+
}
624605
}
625606
}
626607

608+
bidirectional_lang_item_map! {
609+
// tidy-alphabetical-start
610+
AsyncDestruct,
611+
AsyncFnKindHelper,
612+
AsyncFnKindUpvars,
613+
AsyncFnOnceOutput,
614+
AsyncIterator,
615+
CallOnceFuture,
616+
CallRefFuture,
617+
Clone,
618+
Copy,
619+
Coroutine,
620+
CoroutineReturn,
621+
CoroutineYield,
622+
Destruct,
623+
DiscriminantKind,
624+
DynMetadata,
625+
EffectsMaybe,
626+
EffectsIntersection,
627+
EffectsIntersectionOutput,
628+
EffectsNoRuntime,
629+
EffectsRuntime,
630+
FnPtrTrait,
631+
FusedIterator,
632+
Future,
633+
FutureOutput,
634+
Iterator,
635+
Metadata,
636+
Option,
637+
PointeeTrait,
638+
PointerLike,
639+
Poll,
640+
Sized,
641+
TransmuteTrait,
642+
Tuple,
643+
Unpin,
644+
Unsize,
645+
// tidy-alphabetical-end
646+
}
647+
627648
impl<'tcx> rustc_type_ir::inherent::DefId<TyCtxt<'tcx>> for DefId {
628649
fn as_local(self) -> Option<LocalDefId> {
629650
self.as_local()

‎compiler/rustc_next_trait_solver/src/solve/assembly/mod.rs‎

Lines changed: 50 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -387,48 +387,61 @@ where
387387
G::consider_auto_trait_candidate(self, goal)
388388
} else if cx.trait_is_alias(trait_def_id) {
389389
G::consider_trait_alias_candidate(self, goal)
390-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::Sized) {
391-
G::consider_builtin_sized_candidate(self, goal)
392-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::Copy)
393-
|| cx.is_lang_item(trait_def_id, TraitSolverLangItem::Clone)
394-
{
395-
G::consider_builtin_copy_clone_candidate(self, goal)
396-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::PointerLike) {
397-
G::consider_builtin_pointer_like_candidate(self, goal)
398-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::FnPtrTrait) {
399-
G::consider_builtin_fn_ptr_trait_candidate(self, goal)
400390
} else if let Some(kind) = self.cx().fn_trait_kind_from_def_id(trait_def_id) {
401391
G::consider_builtin_fn_trait_candidates(self, goal, kind)
402392
} else if let Some(kind) = self.cx().async_fn_trait_kind_from_def_id(trait_def_id) {
403393
G::consider_builtin_async_fn_trait_candidates(self, goal, kind)
404-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::AsyncFnKindHelper) {
405-
G::consider_builtin_async_fn_kind_helper_candidate(self, goal)
406-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::Tuple) {
407-
G::consider_builtin_tuple_candidate(self, goal)
408-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::PointeeTrait) {
409-
G::consider_builtin_pointee_candidate(self, goal)
410-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::Future) {
411-
G::consider_builtin_future_candidate(self, goal)
412-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::Iterator) {
413-
G::consider_builtin_iterator_candidate(self, goal)
414-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::FusedIterator) {
415-
G::consider_builtin_fused_iterator_candidate(self, goal)
416-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::AsyncIterator) {
417-
G::consider_builtin_async_iterator_candidate(self, goal)
418-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::Coroutine) {
419-
G::consider_builtin_coroutine_candidate(self, goal)
420-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::DiscriminantKind) {
421-
G::consider_builtin_discriminant_kind_candidate(self, goal)
422-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::AsyncDestruct) {
423-
G::consider_builtin_async_destruct_candidate(self, goal)
424-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::Destruct) {
425-
G::consider_builtin_destruct_candidate(self, goal)
426-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::TransmuteTrait) {
427-
G::consider_builtin_transmute_candidate(self, goal)
428-
} else if cx.is_lang_item(trait_def_id, TraitSolverLangItem::EffectsIntersection) {
429-
G::consider_builtin_effects_intersection_candidate(self, goal)
430394
} else {
431-
Err(NoSolution)
395+
match cx.as_lang_item(trait_def_id) {
396+
Some(TraitSolverLangItem::Sized) => G::consider_builtin_sized_candidate(self, goal),
397+
Some(TraitSolverLangItem::Copy | TraitSolverLangItem::Clone) => {
398+
G::consider_builtin_copy_clone_candidate(self, goal)
399+
}
400+
Some(TraitSolverLangItem::PointerLike) => {
401+
G::consider_builtin_pointer_like_candidate(self, goal)
402+
}
403+
Some(TraitSolverLangItem::FnPtrTrait) => {
404+
G::consider_builtin_fn_ptr_trait_candidate(self, goal)
405+
}
406+
Some(TraitSolverLangItem::AsyncFnKindHelper) => {
407+
G::consider_builtin_async_fn_kind_helper_candidate(self, goal)
408+
}
409+
Some(TraitSolverLangItem::Tuple) => G::consider_builtin_tuple_candidate(self, goal),
410+
Some(TraitSolverLangItem::PointeeTrait) => {
411+
G::consider_builtin_pointee_candidate(self, goal)
412+
}
413+
Some(TraitSolverLangItem::Future) => {
414+
G::consider_builtin_future_candidate(self, goal)
415+
}
416+
Some(TraitSolverLangItem::Iterator) => {
417+
G::consider_builtin_iterator_candidate(self, goal)
418+
}
419+
Some(TraitSolverLangItem::FusedIterator) => {
420+
G::consider_builtin_fused_iterator_candidate(self, goal)
421+
}
422+
Some(TraitSolverLangItem::AsyncIterator) => {
423+
G::consider_builtin_async_iterator_candidate(self, goal)
424+
}
425+
Some(TraitSolverLangItem::Coroutine) => {
426+
G::consider_builtin_coroutine_candidate(self, goal)
427+
}
428+
Some(TraitSolverLangItem::DiscriminantKind) => {
429+
G::consider_builtin_discriminant_kind_candidate(self, goal)
430+
}
431+
Some(TraitSolverLangItem::AsyncDestruct) => {
432+
G::consider_builtin_async_destruct_candidate(self, goal)
433+
}
434+
Some(TraitSolverLangItem::Destruct) => {
435+
G::consider_builtin_destruct_candidate(self, goal)
436+
}
437+
Some(TraitSolverLangItem::TransmuteTrait) => {
438+
G::consider_builtin_transmute_candidate(self, goal)
439+
}
440+
Some(TraitSolverLangItem::EffectsIntersection) => {
441+
G::consider_builtin_effects_intersection_candidate(self, goal)
442+
}
443+
_ => Err(NoSolution),
444+
}
432445
};
433446

434447
candidates.extend(result);

‎compiler/rustc_type_ir/src/interner.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@ pub trait Interner:
220220

221221
fn is_lang_item(self, def_id: Self::DefId, lang_item: TraitSolverLangItem) -> bool;
222222

223+
fn as_lang_item(self, def_id: Self::DefId) -> Option<TraitSolverLangItem>;
224+
223225
fn associated_type_def_ids(self, def_id: Self::DefId) -> impl IntoIterator<Item = Self::DefId>;
224226

225227
// FIXME: move `fast_reject` into `rustc_type_ir`.

0 commit comments

Comments
 (0)