diff options
| author | bors <bors@rust-lang.org> | 2025-03-02 01:39:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-02 01:39:49 +0000 |
| commit | 1c3b035542775e9a5decc93167d351b062942d32 (patch) | |
| tree | db204d5c4489aaa968238972bb539f5ec4a1ae0f /compiler/rustc_codegen_gcc | |
| parent | 351686bcfd18dd0f652aba69a806bfa68c57234d (diff) | |
| parent | 5bdde895445a74c4857e34beb222435045f57888 (diff) | |
| download | rust-1c3b035542775e9a5decc93167d351b062942d32.tar.gz rust-1c3b035542775e9a5decc93167d351b062942d32.zip | |
Auto merge of #137855 - matthiaskrgr:rollup-uh7f3fi, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #137804 (rename BackendRepr::Vector → SimdVector) - #137807 (Fully qualify `Result` in generated doctest code) - #137809 (Use correct error message casing for `io::const_error`s) - #137818 (tests: adapt for LLVM 21 changes) - #137822 (Update query normalizer docs to not position it as the greatest pioneer in the space of normalization) - #137824 (Tweak invalid RTN errors) - #137828 (Fix inaccurate `std::intrinsics::simd` documentation) - #137830 (Fix link failure on AVR (incompatible ISA error)) - #137837 (Update `const_conditions` and `explicit_implied_const_bounds` docs) - #137840 (triagebot: only ping me for constck) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/intrinsic/mod.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/type_of.rs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_gcc/src/intrinsic/mod.rs b/compiler/rustc_codegen_gcc/src/intrinsic/mod.rs index f8672c07299..f38622074f1 100644 --- a/compiler/rustc_codegen_gcc/src/intrinsic/mod.rs +++ b/compiler/rustc_codegen_gcc/src/intrinsic/mod.rs @@ -312,7 +312,7 @@ impl<'a, 'gcc, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'a, 'gcc, 'tc let layout = self.layout_of(tp_ty).layout; let _use_integer_compare = match layout.backend_repr() { Scalar(_) | ScalarPair(_, _) => true, - Vector { .. } => false, + SimdVector { .. } => false, Memory { .. } => { // For rusty ABIs, small aggregates are actually passed // as `RegKind::Integer` (see `FnAbi::adjust_for_abi`), diff --git a/compiler/rustc_codegen_gcc/src/type_of.rs b/compiler/rustc_codegen_gcc/src/type_of.rs index bac4fc51300..ae98b3d0b56 100644 --- a/compiler/rustc_codegen_gcc/src/type_of.rs +++ b/compiler/rustc_codegen_gcc/src/type_of.rs @@ -63,7 +63,7 @@ fn uncached_gcc_type<'gcc, 'tcx>( ) -> Type<'gcc> { match layout.backend_repr { BackendRepr::Scalar(_) => bug!("handled elsewhere"), - BackendRepr::Vector { ref element, count } => { + BackendRepr::SimdVector { ref element, count } => { let element = layout.scalar_gcc_type_at(cx, element, Size::ZERO); let element = // NOTE: gcc doesn't allow pointer types in vectors. @@ -178,7 +178,7 @@ pub trait LayoutGccExt<'tcx> { impl<'tcx> LayoutGccExt<'tcx> for TyAndLayout<'tcx> { fn is_gcc_immediate(&self) -> bool { match self.backend_repr { - BackendRepr::Scalar(_) | BackendRepr::Vector { .. } => true, + BackendRepr::Scalar(_) | BackendRepr::SimdVector { .. } => true, BackendRepr::ScalarPair(..) | BackendRepr::Memory { .. } => false, } } @@ -186,9 +186,9 @@ impl<'tcx> LayoutGccExt<'tcx> for TyAndLayout<'tcx> { fn is_gcc_scalar_pair(&self) -> bool { match self.backend_repr { BackendRepr::ScalarPair(..) => true, - BackendRepr::Scalar(_) | BackendRepr::Vector { .. } | BackendRepr::Memory { .. } => { - false - } + BackendRepr::Scalar(_) + | BackendRepr::SimdVector { .. } + | BackendRepr::Memory { .. } => false, } } |
