diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-03-10 13:57:16 +0100 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-03-10 13:57:16 +0100 |
| commit | 81f9dc2c0ffaf4c9581b5895e4517139f7c70a19 (patch) | |
| tree | bd9f591058bae6352855e2902e44e627172001ad | |
| parent | 22237ed22526c9a58cdfb3d0c3d91c3700bbaf4c (diff) | |
| parent | 2ad8e1fb51bb998d353bbf500c3a6c3544b9110a (diff) | |
| download | rust-81f9dc2c0ffaf4c9581b5895e4517139f7c70a19.tar.gz rust-81f9dc2c0ffaf4c9581b5895e4517139f7c70a19.zip | |
Sync from rust 39f2657d1101b50f9b71ae460b762d330cc8426b
| -rw-r--r-- | src/base.rs | 1 | ||||
| -rw-r--r-- | src/constant.rs | 3 | ||||
| -rw-r--r-- | src/intrinsics/mod.rs | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/base.rs b/src/base.rs index 898b94ba4c8..153133e2d11 100644 --- a/src/base.rs +++ b/src/base.rs @@ -496,7 +496,6 @@ fn codegen_fn_body(fx: &mut FunctionCx<'_, '_, '_>, start_block: Block) { TerminatorKind::Yield { .. } | TerminatorKind::FalseEdge { .. } | TerminatorKind::FalseUnwind { .. } - | TerminatorKind::DropAndReplace { .. } | TerminatorKind::GeneratorDrop => { bug!("shouldn't exist at codegen {:?}", bb_data.terminator()); } diff --git a/src/constant.rs b/src/constant.rs index 04e0897dad5..b63087353bc 100644 --- a/src/constant.rs +++ b/src/constant.rs @@ -543,8 +543,7 @@ pub(crate) fn mir_operand_get_const_val<'tcx>( | TerminatorKind::Unreachable | TerminatorKind::Drop { .. } | TerminatorKind::Assert { .. } => {} - TerminatorKind::DropAndReplace { .. } - | TerminatorKind::Yield { .. } + TerminatorKind::Yield { .. } | TerminatorKind::GeneratorDrop | TerminatorKind::FalseEdge { .. } | TerminatorKind::FalseUnwind { .. } => unreachable!(), diff --git a/src/intrinsics/mod.rs b/src/intrinsics/mod.rs index 88f37b19529..fe48cac4faf 100644 --- a/src/intrinsics/mod.rs +++ b/src/intrinsics/mod.rs @@ -281,8 +281,12 @@ fn codegen_float_intrinsic_call<'tcx>( sym::ceilf64 => ("ceil", 1, fx.tcx.types.f64, types::F64), sym::truncf32 => ("truncf", 1, fx.tcx.types.f32, types::F32), sym::truncf64 => ("trunc", 1, fx.tcx.types.f64, types::F64), + sym::rintf32 => ("rintf", 1, fx.tcx.types.f32, types::F32), + sym::rintf64 => ("rint", 1, fx.tcx.types.f64, types::F64), sym::roundf32 => ("roundf", 1, fx.tcx.types.f32, types::F32), sym::roundf64 => ("round", 1, fx.tcx.types.f64, types::F64), + sym::roundevenf32 => ("roundevenf", 1, fx.tcx.types.f32, types::F32), + sym::roundevenf64 => ("roundeven", 1, fx.tcx.types.f64, types::F64), sym::sinf32 => ("sinf", 1, fx.tcx.types.f32, types::F32), sym::sinf64 => ("sin", 1, fx.tcx.types.f64, types::F64), sym::cosf32 => ("cosf", 1, fx.tcx.types.f32, types::F32), |