WI #2016 Implement unreachable code detection (#2023)

fm-117 · web-flow · commit aea6c3c7c525 · 2021-08-17T12:25:23.000+02:00
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/Alter0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/Alter0.diag
@@ -1,2 +1,4 @@
 --- Diagnostics ---
 Line 10[12,16] <37, Warning, General> - Warning: ALTER should not be used
+Line 12[12,30] <37, Warning, General> - Warning: Unreachable code detected
+Line 13[12,17] <37, Warning, General> - Warning: Unreachable code detected
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/Alter3.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/Alter3.diag
@@ -9,3 +9,7 @@ Line 15[12,46] <30, Error, Semantics> - Semantic error: Bad ALTER instruction: c
 Line 17[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 17[12,46] <30, Error, Semantics> - Semantic error: Bad ALTER instruction: could not locate corresponding altered GO TO.
 Line 22[8,10] <37, Warning, General> - Warning: Paragraph 'p2' is empty
+Line 24[12,23] <37, Warning, General> - Warning: Unreachable code detected
+Line 27[12,23] <37, Warning, General> - Warning: Unreachable code detected
+Line 31[12,41] <37, Warning, General> - Warning: Unreachable code detected
+Line 34[12,27] <37, Warning, General> - Warning: Unreachable code detected
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/CGM110.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/CGM110.diag
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/CfgInNestedProcedure0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/CfgInNestedProcedure0.diag
@@ -0,0 +1,3 @@
+--- Diagnostics ---
+Line 27[8,27] <37, Warning, General> - Warning: Unreachable code detected
+Line 110[14,47] <37, Warning, General> - Warning: Unreachable code detected
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/CfgInProcedure1.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/CfgInProcedure1.diag
@@ -0,0 +1,2 @@
+--- Diagnostics ---
+Line 20[8,27] <37, Warning, General> - Warning: Unreachable code detected
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/ComplexGotoPara0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/ComplexGotoPara0.diag
@@ -0,0 +1,2 @@
+--- Diagnostics ---
+Line 14[8,27] <37, Warning, General> - Warning: Unreachable code detected
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/ExtendedPerformProc3Recursive0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/ExtendedPerformProc3Recursive0.diag
@@ -0,0 +1,3 @@
+﻿--- Diagnostics ---
+Line 28[15,29] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec2'.
+Line 29[15,57] <37, Warning, General> - Warning: Unreachable code detected
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/ExtendedPerformProc4Recursive0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/ExtendedPerformProc4Recursive0.diag
@@ -0,0 +1,5 @@
+﻿--- Diagnostics ---
+Line 31[15,29] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec2'.
+Line 32[15,57] <37, Warning, General> - Warning: Unreachable code detected
+Line 57[15,64] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec4', recursive instruction is '       perform pararec4 varying n from 1 by 1 until n > 5'.
+Line 57[15,64] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec4', recursive instruction is '       perform pararec3 test after varying n from 1 by 1 until n'.
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/GoBack1.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/GoBack1.diag
@@ -0,0 +1,2 @@
+--- Diagnostics ---
+Line 12[11,35] <37, Warning, General> - Warning: Unreachable code detected
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/IX105A.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/IX105A.diag
@@ -1,12 +1,18 @@
 --- Diagnostics ---
 Line 339[12,15] <37, Warning, General> - Warning: GOBACK should be used instead of STOP RUN OffendingSymbol=[12,15:STOP]<STOP>
+Line 340[15,36] <37, Warning, General> - Warning: Unreachable code detected
+Line 340[39,62] <37, Warning, General> - Warning: Unreachable code detected
+Line 343[18,39] <37, Warning, General> - Warning: Unreachable code detected
+Line 343[43,65] <37, Warning, General> - Warning: Unreachable code detected
+Line 344[12,49] <37, Warning, General> - Warning: Unreachable code detected
 Line 346[12,38] <37, Warning, General> - Warning: "end-if" is missing
 Line 350[12,37] <37, Warning, General> - Warning: "end-if" is missing
 Line 355[12,38] <37, Warning, General> - Warning: "end-if" is missing
 Line 381[12,50] <37, Warning, General> - Warning: "end-if" is missing
 Line 388[12,45] <37, Warning, General> - Warning: "end-if" is missing
 Line 393[13,46] <37, Warning, General> - Warning: "end-if" is missing
 Line 401[12,37] <37, Warning, General> - Warning: "end-if" is missing
+Line 419[12,25] <37, Warning, General> - Warning: Unreachable code detected
 Line 421[12,47] <37, Warning, General> - Warning: "end-if" is missing
 Line 423[12,46] <37, Warning, General> - Warning: "end-if" is missing
 Line 436[12,47] <37, Warning, General> - Warning: "end-if" is missing
@@ -18,6 +24,9 @@ Line 458[12,53] <37, Warning, General> - Warning: Statement '       GO TO WRITE-
 Line 459[12,54] <37, Warning, General> - Warning: Statement '       GO TO WRITE-TEST-GF-01-FAIL' located at line 485, column 15 prevents this PERFORM statement to reach its exit.
 Line 460[12,44] <37, Warning, General> - Warning: Statement '       GO TO WRITE-TEST-GF-01-FAIL' located at line 478, column 15 prevents this PERFORM statement to reach its exit.
 Line 461[12,37] <37, Warning, General> - Warning: "end-if" is missing
+Line 468[12,26] <37, Warning, General> - Warning: Unreachable code detected
+Line 470[12,31] <37, Warning, General> - Warning: Unreachable code detected
+Line 471[12,33] <37, Warning, General> - Warning: Unreachable code detected
 Line 507[12,40] <37, Warning, General> - Warning: "end-if" is missing
 Line 511[12,33] <37, Warning, General> - Warning: "end-if" is missing
 Line 546[12,42] <37, Warning, General> - Warning: "end-if" is missing
@@ -30,6 +39,9 @@ Line 603[12,53] <37, Warning, General> - Warning: Statement '       GO TO WRITE-
 Line 604[12,54] <37, Warning, General> - Warning: Statement '       GO TO WRITE-TEST-GF-02-FAIL' located at line 630, column 15 prevents this PERFORM statement to reach its exit.
 Line 605[12,44] <37, Warning, General> - Warning: Statement '       GO TO WRITE-TEST-GF-02-FAIL' located at line 623, column 15 prevents this PERFORM statement to reach its exit.
 Line 606[12,37] <37, Warning, General> - Warning: "end-if" is missing
+Line 613[12,26] <37, Warning, General> - Warning: Unreachable code detected
+Line 615[12,31] <37, Warning, General> - Warning: Unreachable code detected
+Line 616[12,33] <37, Warning, General> - Warning: Unreachable code detected
 Line 651[12,40] <37, Warning, General> - Warning: "end-if" is missing
 Line 655[12,33] <37, Warning, General> - Warning: "end-if" is missing
 Line 686[12,42] <37, Warning, General> - Warning: "end-if" is missing
@@ -44,6 +56,9 @@ Line 743[12,53] <37, Warning, General> - Warning: Statement '       GO TO WRITE-
 Line 744[12,54] <37, Warning, General> - Warning: Statement '       GO TO WRITE-TEST-GF-03-FAIL' located at line 770, column 15 prevents this PERFORM statement to reach its exit.
 Line 745[12,44] <37, Warning, General> - Warning: Statement '       GO TO WRITE-TEST-GF-03-FAIL' located at line 763, column 15 prevents this PERFORM statement to reach its exit.
 Line 746[12,37] <37, Warning, General> - Warning: "end-if" is missing
+Line 753[12,26] <37, Warning, General> - Warning: Unreachable code detected
+Line 755[12,31] <37, Warning, General> - Warning: Unreachable code detected
+Line 756[12,26] <37, Warning, General> - Warning: Unreachable code detected
 Line 794[12,39] <37, Warning, General> - Warning: "end-if" is missing
 Line 801[12,42] <37, Warning, General> - Warning: "end-if" is missing
 Line 829[12,42] <37, Warning, General> - Warning: "end-if" is missing
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcedure1.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcedure1.diag
@@ -1,2 +1,9 @@
 --- Diagnostics ---
 Line 24[8,17] <37, Warning, General> - Warning: Paragraph 'B-PROCESS' is empty
+Line 26[12,39] <37, Warning, General> - Warning: Unreachable code detected
+Line 27[12,43] <37, Warning, General> - Warning: Unreachable code detected
+Line 28[12,22] <37, Warning, General> - Warning: Unreachable code detected
+Line 29[12,38] <37, Warning, General> - Warning: Unreachable code detected
+Line 30[12,24] <37, Warning, General> - Warning: Unreachable code detected
+Line 31[12,25] <37, Warning, General> - Warning: Unreachable code detected
+Line 32[16,21] <37, Warning, General> - Warning: Unreachable code detected
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformThru1.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformThru1.diag
@@ -0,0 +1,2 @@
+--- Diagnostics ---
+Line 29[14,47] <37, Warning, General> - Warning: Unreachable code detected
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/SG102A.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/SG102A.diag
@@ -1,5 +1,11 @@
 --- Diagnostics ---
 Line 189[12,15] <37, Warning, General> - Warning: GOBACK should be used instead of STOP RUN OffendingSymbol=[12,15:STOP]<STOP>
+Line 189[12,23] <37, Warning, General> - Warning: Unreachable code detected
+Line 190[15,36] <37, Warning, General> - Warning: Unreachable code detected
+Line 190[39,62] <37, Warning, General> - Warning: Unreachable code detected
+Line 193[18,39] <37, Warning, General> - Warning: Unreachable code detected
+Line 193[43,61] <37, Warning, General> - Warning: Unreachable code detected
+Line 194[12,49] <37, Warning, General> - Warning: Unreachable code detected
 Line 196[12,38] <37, Warning, General> - Warning: "end-if" is missing
 Line 200[12,37] <37, Warning, General> - Warning: "end-if" is missing
 Line 205[12,38] <37, Warning, General> - Warning: "end-if" is missing
@@ -19,18 +25,25 @@ Line 293[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 302[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 307[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 310[12,33] <37, Warning, General> - Warning: "end-if" is missing
+Line 318[12,26] <37, Warning, General> - Warning: Unreachable code detected
 Line 325[12,16] <37, Warning, General> - Warning: ALTER should not be used
+Line 331[12,35] <37, Warning, General> - Warning: Unreachable code detected
+Line 332[12,47] <37, Warning, General> - Warning: Unreachable code detected
+Line 333[12,29] <37, Warning, General> - Warning: Unreachable code detected
 Line 336[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 350[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 356[12,33] <37, Warning, General> - Warning: "end-if" is missing
+Line 364[12,26] <37, Warning, General> - Warning: Unreachable code detected
 Line 380[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 397[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 407[12,40] <37, Warning, General> - Warning: "end-if" is missing
 Line 411[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 426[12,39] <37, Warning, General> - Warning: Statement '    GO TO TEST-5A' located at line 597, column 12 prevents this PERFORM statement to reach its exit.
 Line 427[12,33] <37, Warning, General> - Warning: "end-if" is missing
+Line 436[12,26] <37, Warning, General> - Warning: Unreachable code detected
 Line 448[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 451[12,33] <37, Warning, General> - Warning: "end-if" is missing
+Line 459[12,26] <37, Warning, General> - Warning: Unreachable code detected
 Line 470[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 485[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 495[12,26] <37, Warning, General> - Warning: Statement '        GO TO TEST-3-WRITE' located at line 516, column 16 prevents this PERFORM statement to reach its exit.
@@ -39,12 +52,15 @@ Line 496[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 497[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 498[12,42] <37, Warning, General> - Warning: Statement '        GO TO TEST-3-WRITE' located at line 516, column 16 prevents this PERFORM statement to reach its exit.
 Line 498[12,42] <37, Warning, General> - Warning: Statement '    GO TO TEST-3-WRITE' located at line 520, column 12 prevents this PERFORM statement to reach its exit.
+Line 503[12,26] <37, Warning, General> - Warning: Unreachable code detected
 Line 514[12,33] <37, Warning, General> - Warning: "end-if" is missing
 Line 526[12,33] <37, Warning, General> - Warning: "end-if" is missing
 Line 539[12,33] <37, Warning, General> - Warning: "end-if" is missing
+Line 547[12,26] <37, Warning, General> - Warning: Unreachable code detected
 Line 559[12,39] <37, Warning, General> - Warning: Statement '    GO TO SEG-TEST-2' located at line 369, column 12 prevents this PERFORM statement to reach its exit.
 Line 559[12,39] <37, Warning, General> - Warning: Statement '    GO TO SEG-TEST8' located at line 372, column 12 prevents this PERFORM statement to reach its exit.
 Line 560[12,33] <37, Warning, General> - Warning: "end-if" is missing
+Line 568[12,26] <37, Warning, General> - Warning: Unreachable code detected
 Line 576[12,16] <37, Warning, General> - Warning: ALTER should not be used
 Line 578[12,33] <37, Warning, General> - Warning: "end-if" is missing
 Line 594[12,16] <37, Warning, General> - Warning: ALTER should not be used
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/SimpleGotoPara0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/SimpleGotoPara0.diag
@@ -0,0 +1,3 @@
+﻿--- Diagnostics ---
+Line 13[15,35] <37, Warning, General> - Warning: Unreachable code detected
+Line 14[15,20] <37, Warning, General> - Warning: Unreachable code detected
diff --git a/TypeCobol.Analysis.Test/BasicControlFlowInstructionTest.cs b/TypeCobol.Analysis.Test/BasicControlFlowInstructionTest.cs
@@ -693,14 +693,14 @@ public void ExtendedPerformProc1Recursive0()
         public void ExtendedPerformProc3Recursive0()
         {
             const string baseName = "PerformProc3Recursive0";
-            TestTemplate(inputFileName: baseName, expectedDiagnosticsFileName: baseName, mode: CfgBuildingMode.Extended);
+            TestTemplate(inputFileName: baseName, mode: CfgBuildingMode.Extended);
         }
 
         [TestMethod]
         public void ExtendedPerformProc4Recursive0()
         {
             const string baseName = "PerformProc4Recursive0";
-            TestTemplate(inputFileName:baseName, expectedDiagnosticsFileName:baseName, mode:CfgBuildingMode.Extended);
+            TestTemplate(inputFileName:baseName, mode:CfgBuildingMode.Extended);
         }
 
         [TestMethod]
diff --git a/TypeCobol.Analysis/Cfg/ControlFlowGraphBuilder.cs b/TypeCobol.Analysis/Cfg/ControlFlowGraphBuilder.cs
diff --git a/TypeCobol.Analysis/Graph/ControlFlowGraph.cs b/TypeCobol.Analysis/Graph/ControlFlowGraph.cs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+--- Diagnostics ---`
	`2`	`+Line 27[8,27] <37, Warning, General> - Warning: Unreachable code detected`
	`3`	`+Line 110[14,47] <37, Warning, General> - Warning: Unreachable code detected`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--- Diagnostics ---`
	`2`	`+Line 20[8,27] <37, Warning, General> - Warning: Unreachable code detected`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--- Diagnostics ---`
	`2`	`+Line 14[8,27] <37, Warning, General> - Warning: Unreachable code detected`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+--- Diagnostics ---`
	`2`	`+Line 28[15,29] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is ' perform pararec2'.`
	`3`	`+Line 29[15,57] <37, Warning, General> - Warning: Unreachable code detected`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--- Diagnostics ---`
	`2`	`+Line 12[11,35] <37, Warning, General> - Warning: Unreachable code detected`