diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-04-03 22:11:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 22:11:02 +0200 |
| commit | 6728f2fef4286d7060feb7667b5da9ef3f512e34 (patch) | |
| tree | 80892ac88c77856819b3f0fe8b4d569d96705591 | |
| parent | b0710dc5f5be62a2f5151642a71edb54b6ee8728 (diff) | |
| parent | 46fc398706da87768f1f8ea1cdb9af2e17512a68 (diff) | |
| download | rust-6728f2fef4286d7060feb7667b5da9ef3f512e34.tar.gz rust-6728f2fef4286d7060feb7667b5da9ef3f512e34.zip | |
Rollup merge of #123419 - petrochenkov:zeroindex, r=compiler-errors
rustc_index: Add a `ZERO` constant to index types It is commonly used.
| -rw-r--r-- | src/intrinsics/llvm_x86.rs | 2 | ||||
| -rw-r--r-- | src/vtable.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/intrinsics/llvm_x86.rs b/src/intrinsics/llvm_x86.rs index 1615dc5de69..8df83c706a1 100644 --- a/src/intrinsics/llvm_x86.rs +++ b/src/intrinsics/llvm_x86.rs @@ -1393,7 +1393,7 @@ fn llvm_add_sub<'tcx>( // c + carry -> c + first intermediate carry or borrow respectively let int0 = crate::num::codegen_checked_int_binop(fx, bin_op, a, b); - let c = int0.value_field(fx, FieldIdx::new(0)); + let c = int0.value_field(fx, FieldIdx::ZERO); let cb0 = int0.value_field(fx, FieldIdx::new(1)).load_scalar(fx); // c + carry -> c + second intermediate carry or borrow respectively diff --git a/src/vtable.rs b/src/vtable.rs index 86ebf37d105..04e24320f91 100644 --- a/src/vtable.rs +++ b/src/vtable.rs @@ -61,7 +61,7 @@ pub(crate) fn get_ptr_and_method_ref<'tcx>( if ty.is_dyn_star() { let inner_layout = fx.layout_of(arg.layout().ty.builtin_deref(true).unwrap().ty); let dyn_star = CPlace::for_ptr(Pointer::new(arg.load_scalar(fx)), inner_layout); - let ptr = dyn_star.place_field(fx, FieldIdx::new(0)).to_ptr(); + let ptr = dyn_star.place_field(fx, FieldIdx::ZERO).to_ptr(); let vtable = dyn_star.place_field(fx, FieldIdx::new(1)).to_cvalue(fx).load_scalar(fx); break 'block (ptr, vtable); |
