]> git.lizzy.rs Git - rust.git/commitdiff
fix ice with trait obj dummy self
authormark <markm@cs.wisc.edu>
Tue, 7 Apr 2020 02:22:36 +0000 (21:22 -0500)
committermark <markm@cs.wisc.edu>
Wed, 8 Apr 2020 03:47:26 +0000 (22:47 -0500)
src/librustc_typeck/variance/constraints.rs

index 9df1311b2b53bb896595751e8345c626eb2abb2e..afa6e49a05cf1abecd304609fc6ffab0cb372aa4 100644 (file)
@@ -315,11 +315,9 @@ fn add_constraints_from_ty(
                 self.add_constraints_from_region(current, r, contra);
 
                 if let Some(poly_trait_ref) = data.principal() {
-                    let poly_trait_ref = poly_trait_ref
-                        .with_self_ty(self.tcx(), self.tcx().types.trait_object_dummy_self);
-                    self.add_constraints_from_trait_ref(
+                    self.add_constraints_from_invariant_substs(
                         current,
-                        *poly_trait_ref.skip_binder(),
+                        poly_trait_ref.skip_binder().substs,
                         variance,
                     );
                 }