diff --git a/lib/clif-backend/src/code.rs b/lib/clif-backend/src/code.rs index 947ea88e25f..359b9f3e4c8 100644 --- a/lib/clif-backend/src/code.rs +++ b/lib/clif-backend/src/code.rs @@ -89,10 +89,13 @@ impl ModuleCodeGenerator func, func_translator, next_local: 0, - clif_signatures: self.clif_signatures.clone(), module_info: Arc::clone(&module_info), - target_config: self.isa.frontend_config().clone(), position: Position::default(), + func_env: FunctionEnvironment { + module_info: Arc::clone(&module_info), + target_config: self.isa.frontend_config().clone(), + clif_signatures: self.clif_signatures.clone(), + }, }; debug_assert_eq!(func_env.func.dfg.num_ebbs(), 0, "Function must be empty"); @@ -391,10 +394,9 @@ pub struct CraneliftFunctionCodeGenerator { func: Function, func_translator: FuncTranslator, next_local: usize, - pub clif_signatures: Map, module_info: Arc>, - target_config: isa::TargetFrontendConfig, position: Position, + func_env: FunctionEnvironment, } pub struct FunctionEnvironment { @@ -1138,11 +1140,6 @@ impl FunctionCodeGenerator for CraneliftFunctionCodeGenerator { //let builder = self.builder.as_mut().unwrap(); //let func_environment = FuncEnv::new(); //let state = TranslationState::new(); - let mut function_environment = FunctionEnvironment { - module_info: Arc::clone(&self.module_info), - target_config: self.target_config.clone(), - clif_signatures: self.clif_signatures.clone(), - }; if self.func_translator.state.control_stack.is_empty() { return Ok(()); @@ -1154,7 +1151,7 @@ impl FunctionCodeGenerator for CraneliftFunctionCodeGenerator { &mut self.position, ); let state = &mut self.func_translator.state; - translate_operator(op, &mut builder, state, &mut function_environment)?; + translate_operator(op, &mut builder, state, &mut self.func_env)?; Ok(()) }