Merge commit 'dbee13661e' into sync_cg_clif-2020-12-27

2020-12-27 10:30:38 +01:00 · 2020-12-27 10:30:38 +01:00 · 52cf01c815
commit 52cf01c815
parent 0f42d47bd5 dbee13661e
28 changed files with 490 additions and 275 deletions
--- a/compiler/rustc_codegen_cranelift/src/vtable.rs
+++ b/compiler/rustc_codegen_cranelift/src/vtable.rs
@ -158,7 +158,8 @@ fn build_vtable<'tcx>(
        )
        .unwrap();

-    fx.cx.module.define_data(data_id, &data_ctx).unwrap();
+    // FIXME don't duplicate definitions in lazy jit mode
+    let _ = fx.cx.module.define_data(data_id, &data_ctx);

    data_id
 }