Update to accomondate vtable mono changes upstream

Author: nbdd0121

src/monomorphize_collector.rs

@@ -937,11 +937,13 @@ fn create_mono_items_for_vtable_methods<'tcx>(
 
     if let ty::Dynamic(ref trait_ty, ..) = trait_ty.kind() {
         if let Some(principal) = trait_ty.principal() {
-            let poly_trait_ref = principal.with_self_ty(tcx, impl_ty);
-            assert!(!poly_trait_ref.has_escaping_bound_vars());
+            let trait_ref =
+                tcx.instantiate_bound_regions_with_erased(principal.with_self_ty(tcx, impl_ty));
+            assert!(!trait_ref.has_escaping_bound_vars());
 
             // Walk all methods of the trait, including those of its supertraits
-            let entries = tcx.vtable_entries(poly_trait_ref);
+            let entries = tcx.vtable_entries(trait_ref);
+            debug!(?entries);
             let methods = entries
                 .iter()
                 .filter_map(|entry| match entry {
@@ -1186,7 +1188,12 @@ fn collect_alloc<'tcx>(
             output.push(create_fn_mono_item(tcx, instance, DUMMY_SP));
         }
         GlobalAlloc::VTable(ty, dyn_ty) => {
-            let alloc_id = tcx.vtable_allocation((ty, dyn_ty.principal()));
+            let alloc_id = tcx.vtable_allocation((
+                ty,
+                dyn_ty
+                    .principal()
+                    .map(|principal| tcx.instantiate_bound_regions_with_erased(principal)),
+            ));
             collect_alloc(tcx, alloc_id, output)
         }
     }