diff options
| author | Eric Holk <ericholk@microsoft.com> | 2022-10-03 17:35:03 -0700 |
|---|---|---|
| committer | Eric Holk <ericholk@microsoft.com> | 2022-10-04 10:59:40 -0700 |
| commit | 43499da7539d4d0f6bfcea14e19cbe3d7dda4777 (patch) | |
| tree | b366e043f26d98090a1dd99a5f709f1f2e353832 /compiler/rustc_codegen_ssa/src | |
| parent | 02cd79afb8080fce8c8ce35533c54d8ecf8f390e (diff) | |
| download | rust-43499da7539d4d0f6bfcea14e19cbe3d7dda4777.tar.gz rust-43499da7539d4d0f6bfcea14e19cbe3d7dda4777.zip | |
Support casting boxes to dyn*
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/rvalue.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs index 56852b0fcc8..c8ff26f74e3 100644 --- a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs +++ b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs @@ -14,6 +14,7 @@ use rustc_middle::ty::cast::{CastTy, IntTy}; use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf}; use rustc_middle::ty::{self, adjustment::PointerCast, Instance, Ty, TyCtxt}; use rustc_span::source_map::{Span, DUMMY_SP}; +use rustc_target::abi::Size; impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { #[instrument(level = "trace", skip(self, bx))] @@ -285,6 +286,10 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { bug!("Only valid to do a DynStar cast into a DynStar type") }; let vtable = get_vtable(bx.cx(), source.ty(self.mir, bx.tcx()), trait_ref); + let data = match operand.layout.pointee_info_at(bx.cx(), Size::ZERO) { + Some(_) => bx.ptrtoint(data, bx.cx().type_isize()), + None => data, + }; OperandValue::Pair(data, vtable) } mir::CastKind::Pointer( |
