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

fix merge conflict

Browse source
This commit is contained in:
Folkert 2021-11-21 20:34:16 +01:00
parent 64869ffb8b
commit f90f5a4bdd
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/gen_dev/src/generic64/mod.rs
View file

@ -884,7 +884,7 @@ impl<
arg_layout: &Layout<'a>, arg_layout: &Layout<'a>,
) -> Result<(), String> { ) -> Result<(), String> {
match arg_layout { match arg_layout {
Layout::Builtin(Builtin::Int64) => { Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => {
let dst_reg = self.claim_general_reg(dst)?; let dst_reg = self.claim_general_reg(dst)?;
let src1_reg = self.load_to_general_reg(src1)?; let src1_reg = self.load_to_general_reg(src1)?;
let src2_reg = self.load_to_general_reg(src2)?; let src2_reg = self.load_to_general_reg(src2)?;

8
compiler/gen_dev/src/lib.rs
View file

@ -412,7 +412,7 @@ where
debug_assert_eq!( debug_assert_eq!(
Layout::Builtin(Builtin::Bool), Layout::Builtin(Builtin::Bool),
*ret_layout, *ret_layout,
"Eq: expected to have return layout of type I1" "Eq: expected to have return layout of type Bool"
); );
self.build_eq(sym, &args[0], &args[1], &arg_layouts[0]) self.build_eq(sym, &args[0], &args[1], &arg_layouts[0])
} }
@ -429,7 +429,7 @@ where
debug_assert_eq!( debug_assert_eq!(
Layout::Builtin(Builtin::Bool), Layout::Builtin(Builtin::Bool),
*ret_layout, *ret_layout,
"NotEq: expected to have return layout of type I1" "NotEq: expected to have return layout of type Bool"
); );
self.build_neq(sym, &args[0], &args[1], &arg_layouts[0]) self.build_neq(sym, &args[0], &args[1], &arg_layouts[0])
} }
@ -444,9 +444,9 @@ where
"NumLt: expected all arguments of to have the same layout" "NumLt: expected all arguments of to have the same layout"
); );
debug_assert_eq!( debug_assert_eq!(
Layout::Builtin(Builtin::Int1), Layout::Builtin(Builtin::Bool),
*ret_layout, *ret_layout,
"NumLt: expected to have return layout of type I1" "NumLt: expected to have return layout of type Bool"
); );
self.build_num_lt(sym, &args[0], &args[1], &arg_layouts[0]) self.build_num_lt(sym, &args[0], &args[1], &arg_layouts[0])
} }