From 161123898f1c48bd7622432e8939183463f4b2ef Mon Sep 17 00:00:00 2001 From: Dylan MacKenzie Date: Tue, 1 Oct 2019 15:21:58 -0700 Subject: [PATCH 1/2] Reset row background for each block Now the first row of each basic block is always light instead of changing seemingly at random. --- src/librustc_mir/dataflow/generic/graphviz.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librustc_mir/dataflow/generic/graphviz.rs b/src/librustc_mir/dataflow/generic/graphviz.rs index 2a08feff9e7..9ed80a98bbb 100644 --- a/src/librustc_mir/dataflow/generic/graphviz.rs +++ b/src/librustc_mir/dataflow/generic/graphviz.rs @@ -211,6 +211,7 @@ where )?; // C: Entry state + self.bg = Background::Light; self.results.seek_to_block_start(block); self.write_row_with_curr_state(w, "", "(on entry)")?; self.prev_state.overwrite(self.results.get()); From ffc52a7fe6b5b928b5e1dce43cf04e188c34f9e4 Mon Sep 17 00:00:00 2001 From: Dylan MacKenzie Date: Tue, 1 Oct 2019 15:23:04 -0700 Subject: [PATCH 2/2] Update example table to match current output --- src/librustc_mir/dataflow/generic/graphviz.rs | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/librustc_mir/dataflow/generic/graphviz.rs b/src/librustc_mir/dataflow/generic/graphviz.rs index 9ed80a98bbb..47ace8f33ec 100644 --- a/src/librustc_mir/dataflow/generic/graphviz.rs +++ b/src/librustc_mir/dataflow/generic/graphviz.rs @@ -165,25 +165,25 @@ where block: BasicBlock, ) -> io::Result<()> { // Sample output: - // +-+--------------------------------------------------+ - // A | bb4 | - // +-+----------------------------------+---------------+ - // B | MIR | STATE | - // +-+----------------------------------+---------------+ - // C | | (on entry) | {_0,_2,_3} | - // +-+----------------------------------+---------------+ - // D |0| 0: StorageLive(_7) | | - // +-+----------------------------------+---------------+ - // |1| 1: StorageLive(_8) | | - // +-+----------------------------------+---------------+ - // |2| 2: _8 = &mut _1 | +_8 | - // +-+----------------------------------+---------------+ - // E |T| _7 = const Foo::twiddle(move _8) | -_8 | - // +-+----------------------------------+---------------+ - // F | | (on unwind) | {_0,_2,_3,_7} | - // +-+----------------------------------+---------------+ - // | | (on successful return) | +_7 | - // +-+----------------------------------+---------------+ + // +-+-----------------------------------------------+ + // A | bb4 | + // +-+----------------------------------+------------+ + // B | MIR | STATE | + // +-+----------------------------------+------------+ + // C | | (on entry) | {_0,_2,_3} | + // +-+----------------------------------+------------+ + // D |0| StorageLive(_7) | | + // +-+----------------------------------+------------+ + // |1| StorageLive(_8) | | + // +-+----------------------------------+------------+ + // |2| _8 = &mut _1 | +_8 | + // +-+----------------------------------+------------+ + // E |T| _4 = const Foo::twiddle(move _2) | -_2 | + // +-+----------------------------------+------------+ + // F | | (on unwind) | {_0,_3,_8} | + // +-+----------------------------------+------------+ + // | | (on successful return) | +_4 | + // +-+----------------------------------+------------+ write!( w,