rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge commit '59a81c2ca1edc88ad3ac4b27a8e03977ffb8e73a' into subtree-update_cg_gcc_2025_01_12

Browse Source
This commit is contained in:
Antoni Boucher
2025-01-13 10:53:58 -05:00
parent 3ff1b6410e 59a81c2ca1
commit 06f0a9bc78
49 changed files with 825 additions and 1519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_codegen_gcc/src/common.rs
View File

@@ -240,14 +240,14 @@ impl<'gcc, 'tcx> ConstCodegenMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
}
};
let ptr_type = base_addr.get_type();
let base_addr = self.const_bitcast(base_addr, self.usize_type);
let base_addr = self.context.new_cast(None, base_addr, self.usize_type);
let offset =
self.context.new_rvalue_from_long(self.usize_type, offset.bytes() as i64);
let ptr = self.const_bitcast(base_addr + offset, ptr_type);
let ptr = self.context.new_cast(None, base_addr + offset, ptr_type);
if !matches!(layout.primitive(), Pointer(_)) {
self.const_bitcast(ptr.dereference(None).to_rvalue(), ty)
} else {
self.const_bitcast(ptr, ty)
self.context.new_cast(None, ptr, ty)
}
}
}