about summary refs log tree commit diff
path: root/compiler
diff options
context:
space:
mode:
authorScott McMurray <scottmcm@users.noreply.github.com>2024-05-16 09:42:36 -0700
committerScott McMurray <scottmcm@users.noreply.github.com>2024-05-16 09:43:42 -0700
commitf60f2e8cb07d21b7d5b0fa7f96dacd2e806b98e4 (patch)
tree50e94a270f6cf8fb45b74b1e2d0e1d6cccf39562 /compiler
parent4a78c00e227124ff9d5ece2d493472e7325c87d3 (diff)
downloadrust-f60f2e8cb07d21b7d5b0fa7f96dacd2e806b98e4.tar.gz
rust-f60f2e8cb07d21b7d5b0fa7f96dacd2e806b98e4.zip
Fix ICE in non-operand `aggregate_raw_ptr` instrinsic codegen
Diffstat (limited to 'compiler')
-rw-r--r--compiler/rustc_codegen_ssa/src/mir/rvalue.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs
index 936ed41a294..ff176a79675 100644
--- a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs
@@ -121,7 +121,11 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                 bx.write_operand_repeatedly(cg_elem, count, dest);
             }
 
-            mir::Rvalue::Aggregate(ref kind, ref operands) => {
+            // This implementation does field projection, so never use it for `RawPtr`,
+            // which will always be fine with the `codegen_rvalue_operand` path below.
+            mir::Rvalue::Aggregate(ref kind, ref operands)
+                if !matches!(**kind, mir::AggregateKind::RawPtr(..)) =>
+            {
                 let (variant_index, variant_dest, active_field_index) = match **kind {
                     mir::AggregateKind::Adt(_, variant_index, _, _, active_field_index) => {
                         let variant_dest = dest.project_downcast(bx, variant_index);