language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-12-15 21:23:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

store string correctly on 32-bit platforms

Browse source
This commit is contained in:
Folkert 2022-07-14 00:26:08 +02:00
parent 2fe590abf4
commit 9f80aa4df7
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/compiler/gen_llvm/src/llvm/build.rs
View file

@ -984,7 +984,7 @@ pub fn build_exp_literal<'a, 'ctx, 'env>(
if str_literal.len() < env.small_str_bytes() as usize { if str_literal.len() < env.small_str_bytes() as usize {
match env.small_str_bytes() { match env.small_str_bytes() {
24 => small_str_ptr_width_8(env, parent, str_literal).into(), 24 => small_str_ptr_width_8(env, parent, str_literal).into(),
12 => small_str_ptr_width_4(env, parent, str_literal).into(), 12 => small_str_ptr_width_4(env, str_literal).into(),
_ => unreachable!("incorrect small_str_bytes"), _ => unreachable!("incorrect small_str_bytes"),
} }
} else { } else {
@ -1051,9 +1051,8 @@ fn small_str_ptr_width_8<'a, 'ctx, 'env>(
fn small_str_ptr_width_4<'a, 'ctx, 'env>( fn small_str_ptr_width_4<'a, 'ctx, 'env>(
env: &Env<'a, 'ctx, 'env>, env: &Env<'a, 'ctx, 'env>,
parent: FunctionValue<'ctx>,
str_literal: &str, str_literal: &str,
) -> PointerValue<'ctx> { ) -> StructValue<'ctx> {
debug_assert_eq!(env.target_info.ptr_width() as u8, 4); debug_assert_eq!(env.target_info.ptr_width() as u8, 4);
let mut array = [0u8; 12]; let mut array = [0u8; 12];
@ -1074,7 +1073,7 @@ fn small_str_ptr_width_4<'a, 'ctx, 'env>(
let ptr_type = env.context.i8_type().ptr_type(address_space); let ptr_type = env.context.i8_type().ptr_type(address_space);
let ptr = env.builder.build_int_to_ptr(ptr, ptr_type, "to_u8_ptr"); let ptr = env.builder.build_int_to_ptr(ptr, ptr_type, "to_u8_ptr");
const_str_alloca_ptr(env, parent, ptr, len, cap) struct_from_fields(env, zig_str_type(env), [(0, ptr.into()), (1, len.into()), (2, cap.into())].into_iter())
} }
pub fn build_exp_call<'a, 'ctx, 'env>( pub fn build_exp_call<'a, 'ctx, 'env>(