diff options
| author | bors <bors@rust-lang.org> | 2023-06-01 08:06:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-01 08:06:07 +0000 |
| commit | fabf9298633ca64450fa2af535252dc44a3b1080 (patch) | |
| tree | 3282afeed0ad7bed91ef3e3c4b88ce67a5dad326 /compiler/rustc_codegen_llvm | |
| parent | 23f93a1266e0530445db590c15e0bb5c1c624eb6 (diff) | |
| parent | 129c5597644b27def33d650f8d8004c90698d34c (diff) | |
| download | rust-fabf9298633ca64450fa2af535252dc44a3b1080.tar.gz rust-fabf9298633ca64450fa2af535252dc44a3b1080.zip | |
Auto merge of #112164 - Dylan-DPC:rollup-93zj7jw, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #108459 (rustdoc: Fix LinkReplacer link matching) - #111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs) - #111892 (rustdoc: add interaction delays for tooltip popovers) - #111980 (Preserve substs in opaques recorded in typeck results) - #112024 (Don't suggest break through nested items) - #112128 (Don't compute inlining status of mono items in advance.) - #112141 (remove reference to Into in ? operator core/std docs, fix #111655) Failed merges: - #112071 (Group rfcs tests) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/builder.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/type_of.rs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/builder.rs b/compiler/rustc_codegen_llvm/src/builder.rs index 4d0bcd53d15..5968e70b1cc 100644 --- a/compiler/rustc_codegen_llvm/src/builder.rs +++ b/compiler/rustc_codegen_llvm/src/builder.rs @@ -486,7 +486,7 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> { assert_eq!(place.llextra.is_some(), place.layout.is_unsized()); if place.layout.is_zst() { - return OperandRef::new_zst(self, place.layout); + return OperandRef::zero_sized(place.layout); } #[instrument(level = "trace", skip(bx))] diff --git a/compiler/rustc_codegen_llvm/src/type_of.rs b/compiler/rustc_codegen_llvm/src/type_of.rs index e264ce78f0d..a493c9c0548 100644 --- a/compiler/rustc_codegen_llvm/src/type_of.rs +++ b/compiler/rustc_codegen_llvm/src/type_of.rs @@ -198,8 +198,7 @@ impl<'tcx> LayoutLlvmExt<'tcx> for TyAndLayout<'tcx> { fn is_llvm_immediate(&self) -> bool { match self.abi { Abi::Scalar(_) | Abi::Vector { .. } => true, - Abi::ScalarPair(..) => false, - Abi::Uninhabited | Abi::Aggregate { .. } => self.is_zst(), + Abi::ScalarPair(..) | Abi::Uninhabited | Abi::Aggregate { .. } => false, } } |
