Revert "[perf] Tweak GenericArgs-related functions"

This reverts commit 22cb22e.

Author: fmease

compiler/rustc_hir_analysis/src/delegation.rs

@@ -276,7 +276,8 @@ fn create_generic_args<'tcx>(
                 tcx.impl_trait_header(parent).unwrap().trait_ref.instantiate_identity().args;
 
             let trait_args = ty::GenericArgs::identity_for_item(tcx, sig_id);
-            let method_args = tcx.mk_args(&trait_args[callee_generics.parent_count..]);
+            let method_args =
+                tcx.mk_args_from_iter(trait_args.iter().skip(callee_generics.parent_count));
             let method_args = build_generic_args(tcx, sig_id, def_id, method_args);
 
             tcx.mk_args_from_iter(parent_args.iter().chain(method_args))

compiler/rustc_middle/src/ty/context.rs

@@ -4,7 +4,7 @@
 
 pub mod tls;
 
-use std::assert_matches::debug_assert_matches;
+use std::assert_matches::{assert_matches, debug_assert_matches};
 use std::borrow::Borrow;
 use std::cmp::Ordering;
 use std::env::VarError;
@@ -263,35 +263,14 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
         }
     }
 
-    fn trait_ref_for_alias(
-        self,
-        def_id: DefId,
-        args: ty::GenericArgsRef<'tcx>,
-    ) -> ty::TraitRef<'tcx> {
-        debug_assert_matches!(self.def_kind(def_id), DefKind::AssocTy | DefKind::AssocConst);
-        let trait_def_id = self.parent(def_id);
-        debug_assert_matches!(self.def_kind(trait_def_id), DefKind::Trait);
-        let trait_generics = self.generics_of(trait_def_id);
-        ty::TraitRef::new_from_args(self, trait_def_id, args.truncate_to(self, trait_generics))
-    }
-
-    fn own_args_for_alias(
-        self,
-        def_id: DefId,
-        args: ty::GenericArgsRef<'tcx>,
-    ) -> &'tcx [ty::GenericArg<'tcx>] {
-        debug_assert_matches!(self.def_kind(def_id), DefKind::AssocTy | DefKind::AssocConst);
-        &args[self.generics_of(def_id).parent_count..]
-    }
-
     fn trait_ref_and_own_args_for_alias(
         self,
         def_id: DefId,
         args: ty::GenericArgsRef<'tcx>,
     ) -> (ty::TraitRef<'tcx>, &'tcx [ty::GenericArg<'tcx>]) {
-        debug_assert_matches!(self.def_kind(def_id), DefKind::AssocTy | DefKind::AssocConst);
+        assert_matches!(self.def_kind(def_id), DefKind::AssocTy | DefKind::AssocConst);
         let trait_def_id = self.parent(def_id);
-        debug_assert_matches!(self.def_kind(trait_def_id), DefKind::Trait);
+        assert_matches!(self.def_kind(trait_def_id), DefKind::Trait);
         let trait_generics = self.generics_of(trait_def_id);
         (
             ty::TraitRef::new_from_args(self, trait_def_id, args.truncate_to(self, trait_generics)),

compiler/rustc_middle/src/ty/generic_args.rs

@@ -588,7 +588,7 @@ impl<'tcx> GenericArgs<'tcx> {
     }
 
     pub fn truncate_to(&self, tcx: TyCtxt<'tcx>, generics: &ty::Generics) -> GenericArgsRef<'tcx> {
-        tcx.mk_args(&self[..generics.count()])
+        tcx.mk_args_from_iter(self.iter().take(generics.count()))
     }
 
     pub fn print_as_list(&self) -> String {

compiler/rustc_type_ir/src/interner.rs

@@ -176,18 +176,6 @@ pub trait Interner:
 
     fn alias_term_kind(self, alias: ty::AliasTerm<Self>) -> ty::AliasTermKind;
 
-    fn trait_ref_for_alias(
-        self,
-        def_id: Self::DefId,
-        args: Self::GenericArgs,
-    ) -> ty::TraitRef<Self>;
-
-    fn own_args_for_alias(
-        self,
-        def_id: Self::DefId,
-        args: Self::GenericArgs,
-    ) -> Self::GenericArgsSlice;
-
     fn trait_ref_and_own_args_for_alias(
         self,
         def_id: Self::DefId,

compiler/rustc_type_ir/src/predicate.rs

@@ -664,6 +664,14 @@ impl<I: Interner> AliasTerm<I> {
         interner.parent(self.def_id)
     }
 
+    /// Extracts the underlying trait reference and own args from this projection.
+    /// For example, if this is a projection of `<T as StreamingIterator>::Item<'a>`,
+    /// then this function would return a `T: StreamingIterator` trait reference and
+    /// `['a]` as the own args.
+    pub fn trait_ref_and_own_args(self, interner: I) -> (TraitRef<I>, I::GenericArgsSlice) {
+        interner.trait_ref_and_own_args_for_alias(self.def_id, self.args)
+    }
+
     /// Extracts the underlying trait reference from this projection.
     /// For example, if this is a projection of `<T as Iterator>::Item`,
     /// then this function would return a `T: Iterator` trait reference.
@@ -672,22 +680,14 @@ impl<I: Interner> AliasTerm<I> {
     /// consider calling [Self::trait_ref_and_own_args] to get those
     /// as well.
     pub fn trait_ref(self, interner: I) -> TraitRef<I> {
-        interner.trait_ref_for_alias(self.def_id, self.args)
+        self.trait_ref_and_own_args(interner).0
     }
 
     /// Extract the own args from this projection.
     /// For example, if this is a projection of `<T as StreamingIterator>::Item<'a>`,
     /// then this function would return the slice `['a]` as the own args.
     pub fn own_args(self, interner: I) -> I::GenericArgsSlice {
-        interner.own_args_for_alias(self.def_id, self.args)
-    }
-
-    /// Extracts the underlying trait reference and own args from this projection.
-    /// For example, if this is a projection of `<T as StreamingIterator>::Item<'a>`,
-    /// then this function would return a `T: StreamingIterator` trait reference and
-    /// `['a]` as the own args.
-    pub fn trait_ref_and_own_args(self, interner: I) -> (TraitRef<I>, I::GenericArgsSlice) {
-        interner.trait_ref_and_own_args_for_alias(self.def_id, self.args)
+        self.trait_ref_and_own_args(interner).1
     }
 }
 

compiler/rustc_type_ir/src/ty_kind.rs

@@ -510,8 +510,7 @@ impl<I: Interner> AliasTy<I> {
     /// consider calling [Self::trait_ref_and_own_args] to get those
     /// as well.
     pub fn trait_ref(self, interner: I) -> ty::TraitRef<I> {
-        debug_assert_eq!(self.kind(interner), AliasTyKind::Projection);
-        interner.trait_ref_for_alias(self.def_id, self.args)
+        self.trait_ref_and_own_args(interner).0
     }
 }