nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-17 01:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use principal of cast target as dyn-star trait ref in codegen

Browse Source
This commit is contained in:
Michael Goulet 2022-08-29 02:49:04 +00:00 committed by Eric Holk
parent ef7062dad6
commit 12353c11ca
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_codegen_ssa/src/mir/rvalue.rs
View File

@ -12,7 +12,6 @@ use rustc_middle::mir;
use rustc_middle::mir::Operand; use rustc_middle::mir::Operand;
use rustc_middle::ty::cast::{CastTy, IntTy}; use rustc_middle::ty::cast::{CastTy, IntTy};
use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf}; use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf};
use rustc_middle::ty::TraitObjectRepresentation;
use rustc_middle::ty::{self, adjustment::PointerCast, Instance, Ty, TyCtxt}; use rustc_middle::ty::{self, adjustment::PointerCast, Instance, Ty, TyCtxt};
use rustc_span::source_map::{Span, DUMMY_SP}; use rustc_span::source_map::{Span, DUMMY_SP};
@ -279,12 +278,12 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
OperandValue::Immediate(v) => v, OperandValue::Immediate(v) => v,
OperandValue::Pair(_, _) => todo!(), OperandValue::Pair(_, _) => todo!(),
}; };
// FIXME: find the real vtable! let trait_ref =
let trait_ref = if let ty::Dynamic(data, _, TraitObjectRepresentation::Sized) = cast.ty.kind() { if let ty::Dynamic(data, _, ty::TraitObjectRepresentation::Sized) = cast.ty.kind() {
data.principal() data.principal()
} else { } else {
bug!("Only valid to do a DynStar cast into a DynStar type") 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 vtable = get_vtable(bx.cx(), source.ty(self.mir, bx.tcx()), trait_ref);
OperandValue::Pair(data, vtable) OperandValue::Pair(data, vtable)
} }