user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't transform short-circuiting logic if const_if_match enabled

Browse source
This commit is contained in:
Dylan MacKenzie 2019-09-19 11:25:19 -07:00
parent 365d123689
commit e969fb2176
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc_mir/hair/cx/expr.rs
View file

@ -341,9 +341,10 @@ fn make_mirror_unadjusted<'a, 'tcx>(
} else {
// FIXME overflow
match (op.node, cx.constness) {
// FIXME(eddyb) use logical ops in constants when
// they can handle that kind of control-flow.
(hir::BinOpKind::And, hir::Constness::Const) => {
// Destroy control flow if `#![feature(const_if_match)]` is not enabled.
(hir::BinOpKind::And, hir::Constness::Const)
if !cx.tcx.features().const_if_match =>
{
cx.control_flow_destroyed.push((
op.span,
"`&&` operator".into(),
@ -354,7 +355,9 @@ fn make_mirror_unadjusted<'a, 'tcx>(
rhs: rhs.to_ref(),
}
}
(hir::BinOpKind::Or, hir::Constness::Const) => {
(hir::BinOpKind::Or, hir::Constness::Const)
if !cx.tcx.features().const_if_match =>
{
cx.control_flow_destroyed.push((
op.span,
"`||` operator".into(),
@ -366,14 +369,14 @@ fn make_mirror_unadjusted<'a, 'tcx>(
}
}
(hir::BinOpKind::And, hir::Constness::NotConst) => {
(hir::BinOpKind::And, _) => {
ExprKind::LogicalOp {
op: LogicalOp::And,
lhs: lhs.to_ref(),
rhs: rhs.to_ref(),
}
}
(hir::BinOpKind::Or, hir::Constness::NotConst) => {
(hir::BinOpKind::Or, _) => {
ExprKind::LogicalOp {
op: LogicalOp::Or,
lhs: lhs.to_ref(),