!! (WIP) insert a goto after the branch marker

Author: Zalathar

compiler/rustc_mir_build/src/build/coverageinfo.rs

@@ -4,7 +4,7 @@ use rustc_middle::mir::coverage::{BlockMarkerId, BranchSpan, CoverageKind};
 use rustc_middle::mir::{self, BasicBlock, SourceInfo, Statement, StatementKind};
 use rustc_middle::ty::TyCtxt;
 use rustc_span::def_id::LocalDefId;
-use rustc_span::{ExpnKind, Span};
+use rustc_span::{ExpnKind, Span, DUMMY_SP};
 
 use crate::build::Builder;
 
@@ -151,13 +151,13 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     pub(crate) fn coverage_add_branch(
         &mut self,
         cond_source_info: SourceInfo,
-        then_blk: BasicBlock,
-        else_blk: BasicBlock,
+        then_blk: &mut BasicBlock,
+        else_blk: &mut BasicBlock,
     ) {
         let hir_info_builder = self.coverage.as_mut().unwrap();
         assert!(hir_info_builder.branch_coverage_enabled);
 
-        let mut inject_branch_marker = |bb: BasicBlock| {
+        let mut inject_branch_marker = |bb: &mut BasicBlock| {
             let id = hir_info_builder.next_block_marker_id();
 
             let statement = Statement {
@@ -167,7 +167,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 })),
             };
 
-            self.cfg.push(bb, statement);
+            self.cfg.push(*bb, statement);
+            let successor_block = self.cfg.start_new_block();
+            self.cfg.goto(*bb, SourceInfo::outermost(DUMMY_SP), successor_block);
+            *bb = successor_block;
             id
         };
 

compiler/rustc_mir_build/src/build/matches/mod.rs

@@ -136,16 +136,16 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     unpack!(block = this.as_temp(block, Some(temp_scope), expr, mutability));
                 let operand = Operand::Move(Place::from(place));
 
-                let then_block = this.cfg.start_new_block();
-                let else_block = this.cfg.start_new_block();
+                let mut then_block = this.cfg.start_new_block();
+                let mut else_block = this.cfg.start_new_block();
                 let term = TerminatorKind::if_(operand, then_block, else_block);
 
                 let source_info = this.source_info(expr_span);
 
                 if let Some(coverage) = &this.coverage
                     && coverage.branch_coverage_enabled
                 {
-                    this.coverage_add_branch(source_info, then_block, else_block);
+                    this.coverage_add_branch(source_info, &mut then_block, &mut else_block);
                 }
 
                 this.cfg.terminate(block, source_info, term);