diff options
| author | Deadbeef <ent3rm4n@gmail.com> | 2021-10-12 05:06:37 +0000 |
|---|---|---|
| committer | Deadbeef <ent3rm4n@gmail.com> | 2021-10-12 05:42:23 +0000 |
| commit | 0134088cd2eed9a48fee853d52b44b019a46cb2f (patch) | |
| tree | cc0851be57824c368154aa2aa2cd933f53d898bc | |
| parent | 2228c49544c055d6a8e86346d2d6932dbfb2a898 (diff) | |
| download | rust-0134088cd2eed9a48fee853d52b44b019a46cb2f.tar.gz rust-0134088cd2eed9a48fee853d52b44b019a46cb2f.zip | |
Add const_eval_select intrinsic
| -rw-r--r-- | src/abi/mod.rs | 4 | ||||
| -rw-r--r-- | src/intrinsics/mod.rs | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/abi/mod.rs b/src/abi/mod.rs index 15bb9067805..78fdf9c02d0 100644 --- a/src/abi/mod.rs +++ b/src/abi/mod.rs @@ -309,13 +309,13 @@ pub(crate) fn codegen_terminator_call<'tcx>( span: Span, func: &Operand<'tcx>, args: &[Operand<'tcx>], - destination: Option<(Place<'tcx>, BasicBlock)>, + mir_dest: Option<(Place<'tcx>, BasicBlock)>, ) { let fn_ty = fx.monomorphize(func.ty(fx.mir, fx.tcx)); let fn_sig = fx.tcx.normalize_erasing_late_bound_regions(ParamEnv::reveal_all(), fn_ty.fn_sig(fx.tcx)); - let destination = destination.map(|(place, bb)| (codegen_place(fx, place), bb)); + let destination = mir_dest.map(|(place, bb)| (codegen_place(fx, place), bb)); // Handle special calls like instrinsics and empty drop glue. let instance = if let ty::FnDef(def_id, substs) = *fn_ty.kind() { diff --git a/src/intrinsics/mod.rs b/src/intrinsics/mod.rs index 48183b2d4f6..313b62c5770 100644 --- a/src/intrinsics/mod.rs +++ b/src/intrinsics/mod.rs @@ -407,11 +407,9 @@ pub(crate) fn codegen_intrinsic_call<'tcx>( destination: Option<(CPlace<'tcx>, BasicBlock)>, span: Span, ) { - let def_id = instance.def_id(); + let intrinsic = fx.tcx.item_name(instance.def_id()); let substs = instance.substs; - let intrinsic = fx.tcx.item_name(def_id); - let ret = match destination { Some((place, _)) => place, None => { |
