language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 06:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

clippy

Browse source
This commit is contained in:
Folkert 2021-06-13 17:21:14 +02:00
parent 26c910cdb3
commit b00dcbd6f0
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
compiler/gen_llvm/src/llvm/build.rs
View file

@ -584,17 +584,25 @@ pub fn construct_optimization_passes<'a>(
(mpm, fpm) (mpm, fpm)
} }
pub fn promote_to_main_function<'a, 'ctx, 'env>( fn promote_to_main_function<'a, 'ctx, 'env>(
env: &Env<'a, 'ctx, 'env>, env: &Env<'a, 'ctx, 'env>,
layout_ids: &mut LayoutIds<'a>, mod_solutions: &'a ModSolutions,
symbol: Symbol, symbol: Symbol,
layout: TopLevelFunctionLayout<'a>, top_level: TopLevelFunctionLayout<'a>,
) -> (&'static str, FunctionValue<'ctx>) { ) -> (&'static str, FunctionValue<'ctx>) {
let fn_name = layout_ids let it = top_level.arguments.iter().copied();
.get(symbol, &(env.arena.alloc(layout).full())) let bytes = roc_mono::alias_analysis::func_name_bytes_help(symbol, it, top_level.result);
.to_symbol_string(symbol, &env.interns); let func_name = FuncName(&bytes);
let func_solutions = mod_solutions.func_solutions(func_name).unwrap();
let roc_main_fn = env.module.get_function(&fn_name).unwrap(); let mut it = func_solutions.specs();
let func_spec = it.next().unwrap();
debug_assert!(
it.next().is_none(),
"we expect only one specialization of this symbol"
);
let roc_main_fn = function_value_by_func_spec(env, *func_spec, symbol, Layout::Struct(&[]));
let main_fn_name = "$Test.main"; let main_fn_name = "$Test.main";
@ -3081,7 +3089,6 @@ fn make_exception_catching_wrapper<'a, 'ctx, 'env>(
pub fn build_proc_headers<'a, 'ctx, 'env>( pub fn build_proc_headers<'a, 'ctx, 'env>(
env: &Env<'a, 'ctx, 'env>, env: &Env<'a, 'ctx, 'env>,
_layout_ids: &mut LayoutIds<'a>,
mod_solutions: &'a ModSolutions, mod_solutions: &'a ModSolutions,
procedures: MutMap<(Symbol, TopLevelFunctionLayout<'a>), roc_mono::ir::Proc<'a>>, procedures: MutMap<(Symbol, TopLevelFunctionLayout<'a>), roc_mono::ir::Proc<'a>>,
scope: &mut Scope<'a, 'ctx>, scope: &mut Scope<'a, 'ctx>,
@ -3173,7 +3180,7 @@ fn build_procedures_help<'a, 'ctx, 'env>(
// Add all the Proc headers to the module. // Add all the Proc headers to the module.
// We have to do this in a separate pass first, // We have to do this in a separate pass first,
// because their bodies may reference each other. // because their bodies may reference each other.
let headers = build_proc_headers(env, &mut layout_ids, &mod_solutions, procedures, &mut scope); let headers = build_proc_headers(env, &mod_solutions, procedures, &mut scope);
let (_, function_pass) = construct_optimization_passes(env.module, opt_level); let (_, function_pass) = construct_optimization_passes(env.module, opt_level);
@ -3223,7 +3230,7 @@ fn build_procedures_help<'a, 'ctx, 'env>(
} }
main_data.map(|(main_fn_symbol, main_fn_layout)| { main_data.map(|(main_fn_symbol, main_fn_layout)| {
promote_to_main_function(env, &mut layout_ids, main_fn_symbol, main_fn_layout) promote_to_main_function(env, mod_solutions, main_fn_symbol, main_fn_layout)
}) })
} }

2
compiler/mono/src/alias_analysis.rs
View file

@ -73,7 +73,7 @@ where
*target = *source; *target = *source;
} }
return name_bytes; name_bytes
} }
pub fn spec_program<'a, I>(procs: I) -> Result<morphic_lib::Solutions> pub fn spec_program<'a, I>(procs: I) -> Result<morphic_lib::Solutions>