Skip to content

Commit

Permalink
Fix rebase
Browse files Browse the repository at this point in the history
antoyo committed Jul 2, 2024
1 parent 05a41b8 commit 6099d97
Showing 2 changed files with 2 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions src/builder.rs
Original file line number Diff line number Diff line change
@@ -1705,14 +1705,6 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {

fn zext(&mut self, value: RValue<'gcc>, dest_typ: Type<'gcc>) -> RValue<'gcc> {
// FIXME(antoyo): this does not zero-extend.
<<<<<<< HEAD
=======
if value.get_type().is_bool() && dest_typ.is_i8(self.cx) {
// FIXME(antoyo): hack because base::from_immediate converts i1 to i8.
// Fix the code in codegen_ssa::base::from_immediate.
return value;
}
>>>>>>> master
self.gcc_int_cast(value, dest_typ)
}

0 comments on commit 6099d97

Please sign in to comment.