Adjust Yul CFG export output

libyul/YulControlFlowGraphExporter.cpp

@@ -96,7 +96,6 @@ Json YulControlFlowGraphExporter::exportBlock(SSACFG const& _cfg, SSACFG::BlockI
  Json exitBlockJson = Json::object();
  std::visit(util::GenericVisitor{
  [&](SSACFG::BasicBlock::MainExit const&) {
- exitBlockJson["targets"] = { "Block" + std::to_string(_blockId.value) };
  exitBlockJson["type"] = "MainExit";
  },
  [&](SSACFG::BasicBlock::Jump const& _jump)
@@ -115,12 +114,10 @@ Json YulControlFlowGraphExporter::exportBlock(SSACFG const& _cfg, SSACFG::BlockI
  _addChild(_conditionalJump.nonZero);
  },
  [&](SSACFG::BasicBlock::FunctionReturn const& _return) {
- exitBlockJson["instructions"] = toJson(_cfg, _return.returnValues);
- exitBlockJson["targets"] = { "Block" + std::to_string(_blockId.value) };
+ exitBlockJson["returnValues"] = toJson(_cfg, _return.returnValues);
  exitBlockJson["type"] = "FunctionReturn";
  },
  [&](SSACFG::BasicBlock::Terminated const&) {
- exitBlockJson["targets"] = { "Block" + std::to_string(_blockId.value) };
  exitBlockJson["type"] = "Terminated";
  },
  [&](SSACFG::BasicBlock::JumpTable const&) {

scripts/common_cmdline.sh

@@ -152,6 +152,7 @@ function stripCLIDecorations
  -e '/^IR:$/d' \
  -e '/^Optimized IR:$/d' \
  -e '/^EVM assembly:$/d' \
+ -e '/^Yul Control Flow Graph:$/d' \
  -e '/^JSON AST (compact format):$/d' \
  -e '/^Function signatures:$/d' \
  -e '/^Contract Storage Layout:$/d' \

solc/CommandLineInterface.cpp

@@ -148,6 +148,7 @@ static bool needsHumanTargetedStdout(CommandLineOptions const& _options)
  _options.compiler.outputs.abi ||
  _options.compiler.outputs.asm_ ||
  _options.compiler.outputs.asmJson ||
+ _options.compiler.outputs.yulCFGJson ||
  _options.compiler.outputs.binary ||
  _options.compiler.outputs.binaryRuntime ||
  _options.compiler.outputs.metadata ||
@@ -311,6 +312,7 @@ void CommandLineInterface::handleYulCFGExport(std::string const& _contractName)
  );
  else
  {
+ sout() << "Yul Control Flow Graph:" << std::endl;
  sout() << util::jsonPrint(
  yulCFGJson.value_or(Json{}),
  m_options.formatting.json

test/cmdlineTests/standard_yul_cfg_json_export/in.sol

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+interface I {
+ function f() external pure returns (uint);
+}
+
+contract C is I {
+ function f() public pure override returns (uint) {
+ return 42;
+ }
+}
+
+contract D {
+ function f() public returns (uint) {
+ C c = new C();
+ return c.f();
+ }
+}

test/cmdlineTests/standard_yul_cfg_json_export/input.json

@@ -0,0 +1,13 @@
+{
+ "language": "Solidity",
+ "sources": {
+ "C": {"urls": ["standard_yul_cfg_json_export/in.sol"]}
+ },
+ "settings": {
+ "optimizer": {
+ "enabled": true
+ },
+ "viaIR": true,
+ "outputSelection": {"*": {"*": ["yulCFGJson"]}}
+ }
+}