about summary refs log tree commit diff
path: root/src/librustc_trans_utils
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-11-04 00:09:14 +0000
committerbors <bors@rust-lang.org>2017-11-04 00:09:14 +0000
commit95a401609f3b2cd1602bbfc442606c6172beebb5 (patch)
tree80325fb1ee8094665fbd1421d17c929615ac59ba /src/librustc_trans_utils
parent2278506f682062c7988c9e534a94366c56693981 (diff)
parent7d87054347b6daf737362d6710a687e48131fb5f (diff)
Auto merge of #45384 - mikhail-m1:mir_add_false_edges_terminator_kind, r=arielb1
add TerminatorKind::FalseEdges and use it in matches

impl #45184 and fixes #45043 right way.

False edges unexpectedly affects uninitialized variables analysis in MIR borrowck.
Diffstat (limited to 'src/librustc_trans_utils')
-rw-r--r--src/librustc_trans_utils/collector.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_trans_utils/collector.rs b/src/librustc_trans_utils/collector.rs
index c45ab65e9d8..fd003fc0979 100644
--- a/src/librustc_trans_utils/collector.rs
+++ b/src/librustc_trans_utils/collector.rs
@@ -623,7 +623,8 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirNeighborCollector<'a, 'tcx> {
             mir::TerminatorKind::Unreachable |
             mir::TerminatorKind::Assert { .. } => {}
             mir::TerminatorKind::GeneratorDrop |
-            mir::TerminatorKind::Yield { .. } => bug!(),
+            mir::TerminatorKind::Yield { .. } |
+            mir::TerminatorKind::FalseEdges { .. } => bug!(),
         }
 
         self.super_terminator_kind(block, kind, location);