Convert, modernize, and refactor cfg generation (#4657)

compiler-explorer · Jan 29, 2023 · ac8f444 · ac8f444
1 parent 6a6efae
commit ac8f444
Show file tree

Hide file tree

Showing 20 changed files with 675 additions and 638 deletions.
diff --git a/lib/base-compiler.ts b/lib/base-compiler.ts
@@ -56,7 +56,7 @@ import {Artifact, ToolResult, ToolTypeKey} from '../types/tool.interfaces';
 
 import {BuildEnvSetupBase, getBuildEnvTypeByKey} from './buildenvsetup';
 import {BuildEnvDownloadInfo} from './buildenvsetup/buildenv.interfaces';
-import * as cfg from './cfg';
+import * as cfg from './cfg/cfg';
 import {CompilationEnvironment} from './compilation-env';
 import {CompilerArguments} from './compiler-arguments';
 import {ClangParser, GCCParser} from './compilers/argument-parsers';
@@ -2379,7 +2379,7 @@ export class BaseCompiler implements ICompiler {
                     // for now do not generate a cfg for llvm ir
                     result.cfg = {};
                 } else {
-                    result.cfg = cfg.generateStructure(this.compiler.compilerType, this.compiler.version, result.asm);
+                    result.cfg = cfg.generateStructure(this.compiler, result.asm);
                 }
             }
         }

diff --git a/lib/cfg.js b/lib/cfg.js