Skip to content

Commit 43499da

Browse files
committed
Support casting boxes to dyn*
1 parent 02cd79a commit 43499da

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

compiler/rustc_codegen_ssa/src/mir/rvalue.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use rustc_middle::ty::cast::{CastTy, IntTy};
1414
use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf};
1515
use rustc_middle::ty::{self, adjustment::PointerCast, Instance, Ty, TyCtxt};
1616
use rustc_span::source_map::{Span, DUMMY_SP};
17+
use rustc_target::abi::Size;
1718

1819
impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
1920
#[instrument(level = "trace", skip(self, bx))]
@@ -285,6 +286,10 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
285286
bug!("Only valid to do a DynStar cast into a DynStar type")
286287
};
287288
let vtable = get_vtable(bx.cx(), source.ty(self.mir, bx.tcx()), trait_ref);
289+
let data = match operand.layout.pointee_info_at(bx.cx(), Size::ZERO) {
290+
Some(_) => bx.ptrtoint(data, bx.cx().type_isize()),
291+
None => data,
292+
};
288293
OperandValue::Pair(data, vtable)
289294
}
290295
mir::CastKind::Pointer(

src/test/ui/dyn-star/box.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// run-pass
2+
// compile-flags: -C opt-level=0
3+
4+
#![feature(dyn_star)]
5+
#![allow(incomplete_features)]
6+
7+
use std::fmt::Display;
8+
9+
fn make_dyn_star() -> dyn* Display {
10+
Box::new(42) as dyn* Display
11+
}
12+
13+
fn main() {
14+
let x = make_dyn_star();
15+
16+
println!("{x}");
17+
}

0 commit comments

Comments
 (0)