diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-10-09 15:02:14 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-10-09 15:02:14 +0200 |
| commit | 376dd765d4724b19ad29d31cb46055d71bfdded4 (patch) | |
| tree | af77868d61c380f6dfaab81beacaafd8e9871eaf | |
| parent | dbeafcc254be6eb39c6809fc7348949b3a82ae92 (diff) | |
| parent | 2228c49544c055d6a8e86346d2d6932dbfb2a898 (diff) | |
| download | rust-376dd765d4724b19ad29d31cb46055d71bfdded4.tar.gz rust-376dd765d4724b19ad29d31cb46055d71bfdded4.zip | |
Sync from rust bb918d0a5bf22211df0423f7474e4e4056978007
| -rw-r--r-- | src/archive.rs | 2 | ||||
| -rw-r--r-- | src/vtable.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/archive.rs b/src/archive.rs index 8a1f6543990..71f510c037f 100644 --- a/src/archive.rs +++ b/src/archive.rs @@ -242,7 +242,7 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> { fn inject_dll_import_lib( &mut self, _lib_name: &str, - _dll_imports: &[rustc_middle::middle::cstore::DllImport], + _dll_imports: &[rustc_session::cstore::DllImport], _tmpdir: &rustc_data_structures::temp_dir::MaybeTempDir, ) { bug!("injecting dll imports is not supported"); diff --git a/src/vtable.rs b/src/vtable.rs index f97d416b66f..36b3725ef42 100644 --- a/src/vtable.rs +++ b/src/vtable.rs @@ -68,7 +68,7 @@ pub(crate) fn get_vtable<'tcx>( ty: Ty<'tcx>, trait_ref: Option<ty::PolyExistentialTraitRef<'tcx>>, ) -> Value { - let alloc_id = fx.tcx.vtable_allocation(ty, trait_ref); + let alloc_id = fx.tcx.vtable_allocation((ty, trait_ref)); let data_id = data_id_for_alloc_id(&mut fx.constants_cx, &mut *fx.module, alloc_id, Mutability::Not); let local_data_id = fx.module.declare_data_in_func(data_id, &mut fx.bcx.func); |