Merge pull request rust-lang#729 from bjorn3/misc_changes

Update cranelift and use crates.io version of gimli

Author: bjorn3

Cargo.lock

@@ -22,7 +22,7 @@ ar = "0.8.0"
 bitflags = "1.1.0"
 byteorder = "1.2.7"
 libc = "0.2.53"
-gimli = { git = "https://github.com/gimli-rs/gimli.git" }
+gimli = "0.19.0"
 indexmap = "1.0.2"
 libloading = "0.5.1"
 
@@ -38,7 +38,7 @@ features = ["compression", "read", "std"] # We don't need WASM support
 #cranelift-simplejit = { path = "../cranelift/cranelift-simplejit" }
 #cranelift-faerie = { path = "../cranelift/cranelift-faerie" }
 
-#[patch."https://github.com/gimli-rs/gimli.git"]
+#[patch.crates-io]
 #gimli = { path = "../" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]

Cargo.toml

@@ -73,8 +73,10 @@ pub fn codegen_inner(sess: &Session, module: &mut Module<impl Backend + 'static>
             .unwrap();
 
         let mut ctx = Context::new();
-        ctx.func = {
-            let mut bcx = FunctionBuilder::new(Function::with_name_signature(ExternalName::user(0, 0), sig.clone()));
+        ctx.func = Function::with_name_signature(ExternalName::user(0, 0), sig.clone());
+        {
+            let mut func_ctx = FunctionBuilderContext::new();
+            let mut bcx = FunctionBuilder::new(&mut ctx.func, &mut func_ctx);
 
             let ebb = bcx.create_ebb();
             bcx.switch_to_block(ebb);
@@ -90,9 +92,8 @@ pub fn codegen_inner(sess: &Session, module: &mut Module<impl Backend + 'static>
             let results = bcx.inst_results(call_inst).to_vec(); // Clone to prevent borrow error
             bcx.ins().return_(&results);
             bcx.seal_all_blocks();
-            bcx.finalize()
-        };
-
+            bcx.finalize();
+        }
         module.define_function(func_id, &mut ctx).unwrap();
     }
 }

src/allocator.rs

@@ -19,8 +19,10 @@ pub fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
         .as_mut()
         .map(|debug_context| FunctionDebugContext::new(tcx, debug_context, mir, &name, &sig));
 
-    // FIXME reuse Function and FunctionBuilder between multiple trans_fn calls
-    let mut bcx = FunctionBuilder::new(Function::with_name_signature(ExternalName::user(0, 0), sig));
+    // Make FunctionBuilder
+    let mut func = Function::with_name_signature(ExternalName::user(0, 0), sig);
+    let mut func_ctx = FunctionBuilderContext::new();
+    let mut bcx = FunctionBuilder::new(&mut func, &mut func_ctx);
 
     // Predefine ebb's
     let start_ebb = bcx.create_ebb();
@@ -56,9 +58,6 @@ pub fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
         codegen_fn_content(&mut fx);
     });
 
-    fx.bcx.seal_all_blocks();
-    let func = fx.bcx.finalize();
-
     // Recover all necessary data from fx, before accessing func will prevent future access to it.
     let instance = fx.instance;
     let clif_comments = fx.clif_comments;
@@ -239,6 +238,9 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
             }
         };
     }
+
+    fx.bcx.seal_all_blocks();
+    fx.bcx.finalize();
 }
 
 fn trans_stmt<'tcx>(

src/base.rs

@@ -98,7 +98,7 @@ pub fn maybe_codegen<'tcx>(
             // Optimize `val >> 64`, because compiler_builtins uses it to deconstruct an 128bit
             // integer into its lsb and msb.
             // https://github.com/rust-lang-nursery/compiler-builtins/blob/79a6a1603d5672cbb9187ff41ff4d9b5048ac1cb/src/int/mod.rs#L217
-            if let Some(64) = resolve_value_imm(&fx.bcx.func, rhs_val) {
+            if let Some(64) = resolve_value_imm(fx.bcx.func, rhs_val) {
                 let (lhs_lsb, lhs_msb) = fx.bcx.ins().isplit(lhs_val);
                 let all_zeros = fx.bcx.ins().iconst(types::I64, 0);
                 let val = match (bin_op, is_signed) {

src/codegen_i128.rs

@@ -279,7 +279,7 @@ pub struct FunctionCx<'clif, 'tcx, B: Backend + 'static> {
     pub instance: Instance<'tcx>,
     pub mir: &'tcx Body<'tcx>,
 
-    pub bcx: FunctionBuilder,
+    pub bcx: FunctionBuilder<'clif>,
     pub ebb_map: HashMap<BasicBlock, Ebb>,
     pub local_map: HashMap<Local, CPlace<'tcx>>,
 

src/common.rs

@@ -56,10 +56,10 @@ pub fn maybe_create_entry_wrapper(tcx: TyCtxt<'_>, module: &mut Module<impl Back
             .unwrap();
 
         let mut ctx = Context::new();
-        ctx.func = {
-            let mut bcx: FunctionBuilder = FunctionBuilder::new(
-                Function::with_name_signature(ExternalName::user(0, 0), cmain_sig.clone())
-            );
+        ctx.func = Function::with_name_signature(ExternalName::user(0, 0), cmain_sig.clone());
+        {
+            let mut func_ctx = FunctionBuilderContext::new();
+            let mut bcx: FunctionBuilder = FunctionBuilder::new(&mut ctx.func, &mut func_ctx);
 
             let ebb = bcx.create_ebb();
             bcx.switch_to_block(ebb);
@@ -93,9 +93,8 @@ pub fn maybe_create_entry_wrapper(tcx: TyCtxt<'_>, module: &mut Module<impl Back
             let result = bcx.inst_results(call_inst)[0];
             bcx.ins().return_(&[result]);
             bcx.seal_all_blocks();
-            bcx.finalize()
-        };
-
+            bcx.finalize();
+        }
         m.define_function(cmain_func_id, &mut ctx).unwrap();
     }
 }

src/main_shim.rs

@@ -36,7 +36,7 @@ fn codegen_print(fx: &mut FunctionCx<'_, '_, impl cranelift_module::Backend>, ms
     // Ignore DuplicateDefinition error, as the data will be the same
     let _ = fx.module.define_data(msg_id, &data_ctx);
 
-    let local_msg_id = fx.module.declare_data_in_func(msg_id, &mut fx.bcx.func);
+    let local_msg_id = fx.module.declare_data_in_func(msg_id, fx.bcx.func);
     #[cfg(debug_assertions)]
     {
         fx.add_entity_comment(local_msg_id, msg);