From aa35d1b173ee98e5931686a699f59f71488a6383 Mon Sep 17 00:00:00 2001
From: Scott McMurray <scottmcm@users.noreply.github.com>
Date: Thu, 11 Apr 2024 21:45:05 -0700
Subject: [PATCH] Also handle AggregateKind::RawPtr in cg_cranelift
---
compiler/rustc_codegen_cranelift/src/base.rs | 13 +++++++++++++
.../src/value_and_place.rs | 17 +++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/compiler/rustc_codegen_cranelift/src/base.rs b/compiler/rustc_codegen_cranelift/src/base.rs
index 771e5b219589a..242b38ec325a0 100644
--- a/compiler/rustc_codegen_cranelift/src/base.rs
+++ b/compiler/rustc_codegen_cranelift/src/base.rs
@@ -804,6 +804,19 @@ fn codegen_stmt<'tcx>(
);
lval.write_cvalue(fx, val);
}
+ Rvalue::Aggregate(ref kind, ref operands)
+ if matches!(**kind, AggregateKind::RawPtr(..)) =>
+ {
+ let ty = to_place_and_rval.1.ty(&fx.mir.local_decls, fx.tcx);
+ let layout = fx.layout_of(fx.monomorphize(ty));
+ let [data, meta] = &*operands.raw else {
+ bug!("RawPtr fields: {operands:?}");
+ };
+ let data = codegen_operand(fx, data);
+ let meta = codegen_operand(fx, meta);
+ let ptr_val = CValue::pointer_from_data_and_meta(data, meta, layout);
+ lval.write_cvalue(fx, ptr_val);
+ }
Rvalue::Aggregate(ref kind, ref operands) => {
let (variant_index, variant_dest, active_field_index) = match **kind {
mir::AggregateKind::Adt(_, variant_index, _, _, active_field_index) => {
diff --git a/compiler/rustc_codegen_cranelift/src/value_and_place.rs b/compiler/rustc_codegen_cranelift/src/value_and_place.rs
index fc5b88a54fe5a..e69ec0cf13c10 100644
--- a/compiler/rustc_codegen_cranelift/src/value_and_place.rs
+++ b/compiler/rustc_codegen_cranelift/src/value_and_place.rs
@@ -94,6 +94,23 @@ impl<'tcx> CValue<'tcx> {
CValue(CValueInner::ByValPair(value, extra), layout)
}
+ /// For `AggregateKind::RawPtr`, create a pointer from its parts.
+ ///
+ /// Panics if the `layout` is not a raw pointer.
+ pub(crate) fn pointer_from_data_and_meta(
+ data: CValue<'tcx>,
+ meta: CValue<'tcx>,
+ layout: TyAndLayout<'tcx>,
+ ) -> CValue<'tcx> {
+ assert!(layout.ty.is_unsafe_ptr());
+ let inner = match (data.0, meta.0) {
+ (CValueInner::ByVal(p), CValueInner::ByVal(m)) => CValueInner::ByValPair(p, m),
+ (p @ CValueInner::ByVal(_), CValueInner::ByRef(..)) if meta.1.is_zst() => p,
+ _ => bug!("RawPtr operands {data:?} {meta:?}"),
+ };
+ CValue(inner, layout)
+ }
+
pub(crate) fn layout(&self) -> TyAndLayout<'tcx> {
self.1
}