diff options
| author | Antoni Boucher <bouanto@zoho.com> | 2024-07-02 12:40:45 -0400 |
|---|---|---|
| committer | Antoni Boucher <bouanto@zoho.com> | 2024-07-02 12:40:45 -0400 |
| commit | 6099d97bcbad92e04b8e34f3c1df706e0de86eb6 (patch) | |
| tree | 0241bc07368c9542ed754b4f6785aa11b0ce3689 | |
| parent | 05a41b88a90b1a9775e565a1551df49042f6affc (diff) | |
| download | rust-6099d97bcbad92e04b8e34f3c1df706e0de86eb6.tar.gz rust-6099d97bcbad92e04b8e34f3c1df706e0de86eb6.zip | |
Fix rebase
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | src/builder.rs | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock index 2ce9eb081ee..cd693835ded 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "gccjit" version = "2.0.0" -source = "git+https://github.com/antoyo/gccjit.rs#f1545d7c2c13e42d78eaac8032d49ab8f7d43b6e" +source = "git+https://github.com/rust-lang/gccjit.rs#328cb1b414f67dfa15162ba7a55ed01931f1b219" dependencies = [ "gccjit_sys", ] @@ -88,7 +88,7 @@ dependencies = [ [[package]] name = "gccjit_sys" version = "0.1.0" -source = "git+https://github.com/antoyo/gccjit.rs#f1545d7c2c13e42d78eaac8032d49ab8f7d43b6e" +source = "git+https://github.com/rust-lang/gccjit.rs#328cb1b414f67dfa15162ba7a55ed01931f1b219" dependencies = [ "libc", ] diff --git a/src/builder.rs b/src/builder.rs index 1a3509bfca5..307348f595d 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -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) } |