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

Merge branch 'trunk' into improve-dependency-solving

Browse source
This commit is contained in:
Folkert de Vries 2020-10-13 00:55:19 +02:00 • committed by GitHub
commit d9827ae467
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/builtins/bitcode/src/lib.rs
View file

@ -6,8 +6,8 @@
mod libm; mod libm;
/// TODO replace this with a normal Inkwell build_cast call - this was just /// TODO this is no longer used. Feel free to delete it the next time
/// used as a proof of concept for getting bitcode importing working! /// we need to rebuild builtins.bc!
#[no_mangle] #[no_mangle]
pub fn i64_to_f64_(num: i64) -> f64 { pub fn i64_to_f64_(num: i64) -> f64 {
num as f64 num as f64

9
compiler/gen/src/llvm/build.rs
View file

@ -2610,8 +2610,13 @@ fn build_int_unary_op<'a, 'ctx, 'env>(
)) ))
} }
NumToFloat => { NumToFloat => {
// TODO specialize this to be not just for i64! // This is an Int, so we need to convert it.
call_bitcode_fn(NumToFloat, env, &[arg.into()], "i64_to_f64_") bd.build_cast(
InstructionOpcode::SIToFP,
arg,
env.context.f64_type(),
"i64_to_f64",
)
} }
_ => { _ => {
unreachable!("Unrecognized int unary operation: {:?}", op); unreachable!("Unrecognized int unary operation: {:?}", op);