From 27ea27e2e3e77f82cc470dd695f54ececa16cb4b Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Sat, 27 Apr 2019 18:49:13 +0200 Subject: [PATCH] Fix using using the same vtable twice --- src/vtable.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/vtable.rs b/src/vtable.rs index 6cfd59dcd08..5c3d62e22bb 100644 --- a/src/vtable.rs +++ b/src/vtable.rs @@ -138,7 +138,12 @@ fn build_vtable<'a, 'tcx: 'a>( false, ) .unwrap(); - fx.module.define_data(data_id, &data_ctx).unwrap(); + + match fx.module.define_data(data_id, &data_ctx) { + Ok(()) | Err(cranelift_module::ModuleError::DuplicateDefinition(_)) => {} + err => err.unwrap(), + } + data_id }