dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent different vtables with the same name 

Fixes #987
This commit is contained in:
bjorn3 2020-06-23 11:41:35 +02:00
parent 9c0d18c8db
commit 1f3dd4f91c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vtable.rs
View File

@ -136,12 +136,13 @@ fn build_vtable<'tcx>(
.module
.declare_data(
&format!(
"__vtable.{}.for.{:?}",
"__vtable.{}.for.{:?}.{}",
trait_ref
.as_ref()
.map(|trait_ref| format!("{:?}", trait_ref.skip_binder()).into())
.unwrap_or(std::borrow::Cow::Borrowed("???")),
layout.ty
layout.ty,
fx.vtables.len(),
),
Linkage::Local,
false,
@ -158,10 +159,7 @@ fn build_vtable<'tcx>(
)
.unwrap();
match fx.module.define_data(data_id, &data_ctx) {
Ok(()) | Err(cranelift_module::ModuleError::DuplicateDefinition(_)) => {}
err => err.unwrap(),
}
fx.module.define_data(data_id, &data_ctx).unwrap();
data_id
}