[FIR-TEST] Check control flow graph in old frontend diagnostic tests

compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt

@@ -83,9 +83,17 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() {
         val allFirFiles = firFilesPerSession.values.flatten()
         checkDiagnostics(testDataFile, testFiles, allFirFiles)
         checkFir(testDataFile, allFirFiles)
+        checkCfg(allFirFiles, testFiles, testDataFile)
+    }
+
+    protected fun checkCfg(
+        allFirFiles: List<FirFile>,
+        testFiles: List<TestFile>,
+        testDataFile: File
+    ) {
         checkCfgEdgeConsistency(allFirFiles)
         if (testFiles.any { it.withDumpCfgDirective }) {
-            checkCfg(testDataFile, allFirFiles)
+            checkCfgDump(testDataFile, allFirFiles)
         } else {
             checkCfgDumpNotExists(testDataFile)
         }
@@ -263,7 +271,7 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() {
         return FirDiagnosticsCollector.create(session)
     }
 
-    private fun checkCfg(testDataFile: File, firFiles: List<FirFile>) {
+    private fun checkCfgDump(testDataFile: File, firFiles: List<FirFile>) {
         val builder = StringBuilder()
 
         firFiles.first().accept(FirControlFlowGraphRenderVisitor(builder), null)

compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt

@@ -53,6 +53,7 @@ abstract class AbstractFirOldFrontendDiagnosticsTest : AbstractFirDiagnosticsTes
             if (needDump) {
                 checkFir(testDataFile, allFirFiles)
             }
+            checkCfg(allFirFiles, testFiles, testDataFile)
         } else {
             if (!failureFile.exists()) {
                 throw failure