diff --git a/src/test/mir-opt/instrument_coverage.main.InstrumentCoverage.diff b/src/test/mir-opt/instrument_coverage.main.InstrumentCoverage.diff index 03affed0505ea..800754542d936 100644 --- a/src/test/mir-opt/instrument_coverage.main.InstrumentCoverage.diff +++ b/src/test/mir-opt/instrument_coverage.main.InstrumentCoverage.diff @@ -9,40 +9,40 @@ bb0: { + Coverage::Counter(0) for /the/src/instrument_coverage.rs:10:11 - 16:2; // scope 0 at /the/src/instrument_coverage.rs:11:5: 15:6 - falseUnwind -> [real: bb1, cleanup: bb2]; // scope 0 at /the/src/instrument_coverage.rs:11:5: 15:6 + falseUnwind -> [real: bb1, cleanup: bb6]; // scope 0 at /the/src/instrument_coverage.rs:11:5: 15:6 } bb1: { StorageLive(_2); // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17 - _2 = bar() -> [return: bb3, unwind: bb2]; // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17 + _2 = bar() -> [return: bb2, unwind: bb6]; // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17 // mir::Constant // + span: /the/src/instrument_coverage.rs:12:12: 12:15 // + literal: Const { ty: fn() -> bool {bar}, val: Value(Scalar()) } } - bb2 (cleanup): { - resume; // scope 0 at /the/src/instrument_coverage.rs:10:1: 16:2 + bb2: { + FakeRead(ForMatchedPlace, _2); // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17 + switchInt(_2) -> [false: bb4, otherwise: bb3]; // scope 0 at /the/src/instrument_coverage.rs:12:9: 14:10 } bb3: { - FakeRead(ForMatchedPlace, _2); // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17 - switchInt(_2) -> [false: bb5, otherwise: bb4]; // scope 0 at /the/src/instrument_coverage.rs:12:9: 14:10 + falseEdge -> [real: bb5, imaginary: bb4]; // scope 0 at /the/src/instrument_coverage.rs:12:9: 14:10 } bb4: { - falseEdge -> [real: bb6, imaginary: bb5]; // scope 0 at /the/src/instrument_coverage.rs:12:9: 14:10 - } - - bb5: { _1 = const (); // scope 0 at /the/src/instrument_coverage.rs:12:9: 14:10 StorageDead(_2); // scope 0 at /the/src/instrument_coverage.rs:15:5: 15:6 goto -> bb0; // scope 0 at /the/src/instrument_coverage.rs:11:5: 15:6 } - bb6: { + bb5: { _0 = const (); // scope 0 at /the/src/instrument_coverage.rs:13:13: 13:18 StorageDead(_2); // scope 0 at /the/src/instrument_coverage.rs:15:5: 15:6 return; // scope 0 at /the/src/instrument_coverage.rs:16:2: 16:2 } + + bb6 (cleanup): { + resume; // scope 0 at /the/src/instrument_coverage.rs:10:1: 16:2 + } } diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.coverage_of_if_else.json b/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.coverage_of_if_else.json index b9041ebebef57..051250d90a24a 100644 --- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.coverage_of_if_else.json +++ b/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.coverage_of_if_else.json @@ -16,15 +16,15 @@ "percent": 100 }, "lines": { - "count": 46, + "count": 40, "covered": 19, - "percent": 41.30434782608695 + "percent": 47.5 }, "regions": { - "count": 75, + "count": 71, "covered": 23, - "notcovered": 52, - "percent": 30.666666666666664 + "notcovered": 48, + "percent": 32.3943661971831 } } } @@ -41,15 +41,15 @@ "percent": 100 }, "lines": { - "count": 46, + "count": 40, "covered": 19, - "percent": 41.30434782608695 + "percent": 47.5 }, "regions": { - "count": 75, + "count": 71, "covered": 23, - "notcovered": 52, - "percent": 30.666666666666664 + "notcovered": 48, + "percent": 32.3943661971831 } } } diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/typical_show_coverage.coverage_of_if_else.txt b/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/typical_show_coverage.coverage_of_if_else.txt index 0c71155960335..87ce3b4048f2a 100644 --- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/typical_show_coverage.coverage_of_if_else.txt +++ b/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/typical_show_coverage.coverage_of_if_else.txt @@ -20,13 +20,13 @@ 16| 0| } else { 17| 0| return; 18| 0| } - 19| 0| - 20| 0| let mut countdown = 0; + 19| | + 20| | let mut countdown = 0; 21| 2| if true { ^1 22| 2| countdown = 10; 23| 2| } - 24| 0| + 24| | 25| 2| if countdown > 7 { ^1 26| 2| countdown -= 4; @@ -40,13 +40,13 @@ 32| 0| } else { 33| 0| return; 34| 0| } - 35| 0| - 36| 0| let mut countdown = 0; + 35| | + 36| | let mut countdown = 0; 37| 2| if true { ^1 38| 2| countdown = 10; 39| 2| } - 40| 0| + 40| | 41| 2| if countdown > 7 { ^1 42| 2| countdown -= 4; diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.coverage_of_if_else.json b/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.coverage_of_if_else.json index b9041ebebef57..051250d90a24a 100644 --- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.coverage_of_if_else.json +++ b/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.coverage_of_if_else.json @@ -16,15 +16,15 @@ "percent": 100 }, "lines": { - "count": 46, + "count": 40, "covered": 19, - "percent": 41.30434782608695 + "percent": 47.5 }, "regions": { - "count": 75, + "count": 71, "covered": 23, - "notcovered": 52, - "percent": 30.666666666666664 + "notcovered": 48, + "percent": 32.3943661971831 } } } @@ -41,15 +41,15 @@ "percent": 100 }, "lines": { - "count": 46, + "count": 40, "covered": 19, - "percent": 41.30434782608695 + "percent": 47.5 }, "regions": { - "count": 75, + "count": 71, "covered": 23, - "notcovered": 52, - "percent": 30.666666666666664 + "notcovered": 48, + "percent": 32.3943661971831 } } } diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/typical_show_coverage.coverage_of_if_else.txt b/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/typical_show_coverage.coverage_of_if_else.txt index 0c71155960335..87ce3b4048f2a 100644 --- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/typical_show_coverage.coverage_of_if_else.txt +++ b/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/typical_show_coverage.coverage_of_if_else.txt @@ -20,13 +20,13 @@ 16| 0| } else { 17| 0| return; 18| 0| } - 19| 0| - 20| 0| let mut countdown = 0; + 19| | + 20| | let mut countdown = 0; 21| 2| if true { ^1 22| 2| countdown = 10; 23| 2| } - 24| 0| + 24| | 25| 2| if countdown > 7 { ^1 26| 2| countdown -= 4; @@ -40,13 +40,13 @@ 32| 0| } else { 33| 0| return; 34| 0| } - 35| 0| - 36| 0| let mut countdown = 0; + 35| | + 36| | let mut countdown = 0; 37| 2| if true { ^1 38| 2| countdown = 10; 39| 2| } - 40| 0| + 40| | 41| 2| if countdown > 7 { ^1 42| 2| countdown -= 4; diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.coverage_of_if_else/coverage_of_if_else.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.coverage_of_if_else/coverage_of_if_else.main.-------.InstrumentCoverage.0.html index 94abe11896cba..fcb6afb263684 100644 --- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.coverage_of_if_else/coverage_of_if_else.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.coverage_of_if_else/coverage_of_if_else.main.-------.InstrumentCoverage.0.html @@ -61,13 +61,13 @@
fn main() { let mut countdown = 0; - 2⦊ 1⦊4⦊3⦊3⦊if 2⦊if 0⦊true⦉00⦊true⦉0 { - { + countdown = 10; - countdown = 10; + }⦉3 }⦉2⦉4⦉2 + 5:5-7:6: Goto: goto -> bb4">⦉3⦉1 - 6⦊ 5⦊9⦊8⦊25⦊if 24⦊if 5⦊countdown > 7⦉54⦊countdown > 7⦉4 { - { + 8⦊countdown -= 4⦉87⦊countdown -= 4⦉7; -; + } else 10⦊if } else 9⦊if 7⦊countdown > 2⦉7 { - 22⦊6⦊countdown > 2⦉6 { + 20⦊23⦊21⦊if 14⦊22⦊21⦊if 15⦊16⦊13⦊20⦊14⦊12⦊18⦊19⦊11⦊13⦊19⦊15⦊12⦊17⦊countdown < 1 || countdown > 5⦉1716⦊17⦊⦉1918⦊countdown < 1 || countdown > 5⦉18⦉18⦉17⦉16 || countdown != 9⦉12⦉15⦉19⦉13 || countdown != 9⦉12⦉20⦉13⦉16⦉11⦉15⦉14 { + 12:12-12:60: SwitchInt: switchInt(move _17) -> [false: bb13, otherwise: bb12]">⦉14 { countdown = 0; + 12:9-14:10: Assign: _10 = const () + 12:9-14:10: Goto: goto -> bb23"> countdown = 0; 24⦊}⦉2223⦊}⦉20⦉23⦉21⦉21⦉22⦉21⦉21 - + countdown -= 5⦉24; - } else { - 27⦊11⦊return; - }⦉11⦉6⦉9⦉25⦉25 countdown -= 5⦉23; + } else { + return; + }⦉9⦉25⦉10⦉10⦉10⦉11 - - let mut countdown = 0; - ⦉24⦉8⦉5 + + let mut countdown = 0; + 30⦊27⦊31⦊29⦊if 28⦊26⦊if 28⦊true⦉28 { - countdown = 10; - }⦉2925⦊true⦉25 { + countdown = 10; + }⦉26⦉31⦉28⦉30 - - 33⦊⦉27 + + 52⦊49⦊36⦊if 33⦊30⦊if 32⦊countdown > 7⦉32 { - 29⦊countdown > 7⦉29 { + 35⦊countdown -= 4⦉35; - } else 37⦊if 32⦊countdown -= 4⦉32; + } else 34⦊if 34⦊countdown > 2⦉34 { - 48⦊31⦊countdown > 2⦉31 { + 46⦊50⦊49⦊if 47⦊45⦊if 44⦊38⦊39⦊40⦊39⦊47⦊36⦊40⦊43⦊42⦊41⦊46⦊45⦊37⦊44⦊countdown < 1 || countdown > 5⦉4441⦊⦉4542⦊⦉46 || countdown != 9⦉41⦉42⦉4343⦊countdown < 1 || countdown > 5⦉43⦉42⦉41⦉40⦉47 || countdown != 9⦉37⦉39 { - countdown = 0; - ⦉36⦉40⦉39⦉38⦉44 { + countdown = 0; + 51⦊}⦉4848⦊}⦉46⦉50⦉49⦉49⦉47⦉45⦉45 - + countdown -= 5⦉51; - } else { - 38⦊return; - }⦉33⦉52 countdown -= 5⦉48; + } else { + return; + }⦉34⦉30⦉36⦉36⦉36⦉37⦉37⦉37 - - let mut countdown = 0; -⦉33 ⦉49 + + let mut countdown = 0; + 52⦊51⦊56⦊54⦊55⦊if 53⦊if 53⦊true⦉53 { - countdown = 10; - }⦉55⦉5450⦊true⦉50⦉56 - - 61⦊58⦊ { + countdown = 10; + }⦉53⦉51⦉52 + + 77⦊if 74⦊55⦊58⦊if 57⦊countdown > 7⦉57 { - 54⦊countdown > 7⦉54 { + 60⦊countdown -= 4⦉60; - } else 62⦊if 57⦊countdown -= 4⦉57; + } else 59⦊if 59⦊countdown > 2⦉59 { - 56⦊countdown > 2⦉56 { + 71⦊75⦊74⦊73⦊if 72⦊70⦊if 63⦊67⦊64⦊68⦊65⦊65⦊62⦊72⦊69⦊64⦊66⦊69⦊61⦊67⦊71⦊70⦊countdown < 1 || countdown > 5⦉7068⦊66⦊countdown < 1 || countdown > 5⦉66⦉71⦉69 || countdown != 9⦉66⦉68⦉67⦉64 || countdown != 9⦉61⦉72⦉69⦉65⦉62⦉68⦉65⦉67 { - countdown = 0; - ⦉64⦉63 { + countdown = 0; + 76⦊}73⦊}⦉71⦉75⦉74⦉73⦉73⦉72⦉70⦉70 - + countdown -= 5⦉76; - } else { - 63⦊return; - } countdown -= 5⦉73; + } else { + return; + }⦉59⦉61⦉58⦉77⦉58⦉55⦉77⦉77⦉62⦉62⦉62 -78⦊}⦉78⦉74 +⦉63⦉38⦉2726⦊⦉26
+ 51:2-51:2: Goto: goto -> bb77">75⦊}⦉7577⦊⦉77 diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.coverage_of_if_else/coverage_of_if_else.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.coverage_of_if_else/coverage_of_if_else.main.-------.InstrumentCoverage.0.html index 94abe11896cba..fcb6afb263684 100644 --- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.coverage_of_if_else/coverage_of_if_else.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.coverage_of_if_else/coverage_of_if_else.main.-------.InstrumentCoverage.0.html @@ -61,13 +61,13 @@
fn main() { let mut countdown = 0; - 2⦊ 1⦊4⦊3⦊3⦊if 2⦊if 0⦊true⦉00⦊true⦉0 { - { + countdown = 10; - countdown = 10; + }⦉3 }⦉2⦉4⦉2 + 5:5-7:6: Goto: goto -> bb4">⦉3⦉1 - 6⦊ 5⦊9⦊8⦊25⦊if 24⦊if 5⦊countdown > 7⦉54⦊countdown > 7⦉4 { - { + 8⦊countdown -= 4⦉87⦊countdown -= 4⦉7; -; + } else 10⦊if } else 9⦊if 7⦊countdown > 2⦉7 { - 22⦊6⦊countdown > 2⦉6 { + 20⦊23⦊21⦊if 14⦊22⦊21⦊if 15⦊16⦊13⦊20⦊14⦊12⦊18⦊19⦊11⦊13⦊19⦊15⦊12⦊17⦊countdown < 1 || countdown > 5⦉1716⦊17⦊⦉1918⦊countdown < 1 || countdown > 5⦉18⦉18⦉17⦉16 || countdown != 9⦉12⦉15⦉19⦉13 || countdown != 9⦉12⦉20⦉13⦉16⦉11⦉15⦉14 { + 12:12-12:60: SwitchInt: switchInt(move _17) -> [false: bb13, otherwise: bb12]">⦉14 { countdown = 0; + 12:9-14:10: Assign: _10 = const () + 12:9-14:10: Goto: goto -> bb23"> countdown = 0; 24⦊}⦉2223⦊}⦉20⦉23⦉21⦉21⦉22⦉21⦉21 - + countdown -= 5⦉24; - } else { - 27⦊11⦊return; - }⦉11⦉6⦉9⦉25⦉25 countdown -= 5⦉23; + } else { + return; + }⦉9⦉25⦉10⦉10⦉10⦉11 - - let mut countdown = 0; - ⦉24⦉8⦉5 + + let mut countdown = 0; + 30⦊27⦊31⦊29⦊if 28⦊26⦊if 28⦊true⦉28 { - countdown = 10; - }⦉2925⦊true⦉25 { + countdown = 10; + }⦉26⦉31⦉28⦉30 - - 33⦊⦉27 + + 52⦊49⦊36⦊if 33⦊30⦊if 32⦊countdown > 7⦉32 { - 29⦊countdown > 7⦉29 { + 35⦊countdown -= 4⦉35; - } else 37⦊if 32⦊countdown -= 4⦉32; + } else 34⦊if 34⦊countdown > 2⦉34 { - 48⦊31⦊countdown > 2⦉31 { + 46⦊50⦊49⦊if 47⦊45⦊if 44⦊38⦊39⦊40⦊39⦊47⦊36⦊40⦊43⦊42⦊41⦊46⦊45⦊37⦊44⦊countdown < 1 || countdown > 5⦉4441⦊⦉4542⦊⦉46 || countdown != 9⦉41⦉42⦉4343⦊countdown < 1 || countdown > 5⦉43⦉42⦉41⦉40⦉47 || countdown != 9⦉37⦉39 { - countdown = 0; - ⦉36⦉40⦉39⦉38⦉44 { + countdown = 0; + 51⦊}⦉4848⦊}⦉46⦉50⦉49⦉49⦉47⦉45⦉45 - + countdown -= 5⦉51; - } else { - 38⦊return; - }⦉33⦉52 countdown -= 5⦉48; + } else { + return; + }⦉34⦉30⦉36⦉36⦉36⦉37⦉37⦉37 - - let mut countdown = 0; -⦉33 ⦉49 + + let mut countdown = 0; + 52⦊51⦊56⦊54⦊55⦊if 53⦊if 53⦊true⦉53 { - countdown = 10; - }⦉55⦉5450⦊true⦉50⦉56 - - 61⦊58⦊ { + countdown = 10; + }⦉53⦉51⦉52 + + 77⦊if 74⦊55⦊58⦊if 57⦊countdown > 7⦉57 { - 54⦊countdown > 7⦉54 { + 60⦊countdown -= 4⦉60; - } else 62⦊if 57⦊countdown -= 4⦉57; + } else 59⦊if 59⦊countdown > 2⦉59 { - 56⦊countdown > 2⦉56 { + 71⦊75⦊74⦊73⦊if 72⦊70⦊if 63⦊67⦊64⦊68⦊65⦊65⦊62⦊72⦊69⦊64⦊66⦊69⦊61⦊67⦊71⦊70⦊countdown < 1 || countdown > 5⦉7068⦊66⦊countdown < 1 || countdown > 5⦉66⦉71⦉69 || countdown != 9⦉66⦉68⦉67⦉64 || countdown != 9⦉61⦉72⦉69⦉65⦉62⦉68⦉65⦉67 { - countdown = 0; - ⦉64⦉63 { + countdown = 0; + 76⦊}73⦊}⦉71⦉75⦉74⦉73⦉73⦉72⦉70⦉70 - + countdown -= 5⦉76; - } else { - 63⦊return; - } countdown -= 5⦉73; + } else { + return; + }⦉59⦉61⦉58⦉77⦉58⦉55⦉77⦉77⦉62⦉62⦉62 -78⦊}⦉78⦉74 +⦉63⦉38⦉2726⦊⦉26
+ 51:2-51:2: Goto: goto -> bb77">75⦊}⦉7577⦊⦉77