user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix rebase

Browse source
This commit is contained in:
Antoni Boucher 2024-07-02 12:40:45 -04:00
parent 05a41b88a9
commit 6099d97bcb
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/builder.rs
View file

@ -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)
}