Add literal assignment to SSACFG

Author: clonker

libyul/YulControlFlowGraphExporter.cpp

@@ -177,12 +177,20 @@ Json YulControlFlowGraphExporter::toJson(SSACFG const& _cfg, SSACFG::BlockId _bl
 Json YulControlFlowGraphExporter::toJson(Json& _ret, SSACFG const& _cfg, SSACFG::Operation const& _operation)
 {
 	Json opJson = Json::object();
-	std::visit(util::GenericVisitor{
-		[&](SSACFG::Call const& _call) {
+	std::visit(GenericVisitor{
+		[&](SSACFG::Call const& _call)
+		{
 			_ret["type"] = "FunctionCall";
 			opJson["op"] = _call.function.get().name.str();
 		},
-		[&](SSACFG::BuiltinCall const& _call) {
+		[&](SSACFG::LiteralAssignment const&)
+		{
+			yulAssert(_operation.inputs.size() == 1);
+			yulAssert(_cfg.isLiteralValue(_operation.inputs.back()));
+			_ret["type"] = "LiteralAssignment";
+		},
+		[&](SSACFG::BuiltinCall const& _call)
+		{
 			_ret["type"] = "BuiltinCall";
 			Json builtinArgsJson = Json::array();
 			auto const& builtin = _call.builtin.get();

libyul/backends/evm/SSAControlFlowGraph.cpp

@@ -168,17 +168,28 @@ class SSACFGPrinter
 					[&](SSACFG::BuiltinCall const& _call) {
 						return _call.builtin.get().name;
 					},
+					[&](SSACFG::LiteralAssignment const&)
+					{
+						yulAssert(operation.inputs.size() == 1);
+						return varToString(m_cfg, operation.inputs.back());
+					}
 				}, operation.kind);
 				if (!operation.outputs.empty())
 					m_result << fmt::format(
 						"{} := ",
 						fmt::join(operation.outputs | ranges::views::transform(valueToString), ", ")
 					);
-				m_result << fmt::format(
-					"{}({})\\l\\\n",
-					escape(label),
-					fmt::join(operation.inputs | ranges::views::transform(valueToString), ", ")
-				);
+				if (std::holds_alternative<SSACFG::LiteralAssignment>(operation.kind))
+					m_result << fmt::format(
+						"{}\\l\\\n",
+						escape(label)
+					);
+				else
+					m_result << fmt::format(
+						"{}({})\\l\\\n",
+						escape(label),
+						fmt::join(operation.inputs | ranges::views::transform(valueToString), ", ")
+					);
 			}
 			m_result << "\"];\n";
 			std::visit(GenericVisitor{

libyul/backends/evm/SSAControlFlowGraph.h

@@ -78,10 +78,14 @@ class SSACFG
 		std::reference_wrapper<FunctionCall const> call;
 		bool canContinue;
 	};
+	struct LiteralAssignment
+	{
+		langutil::DebugData::ConstPtr debugData;
+	};
 
 	struct Operation {
 		std::vector<ValueId> outputs{};
-		std::variant<BuiltinCall, Call> kind;
+		std::variant<BuiltinCall, Call, LiteralAssignment> kind;
 		std::vector<ValueId> inputs{};
 	};
 	struct BasicBlock
@@ -199,7 +203,7 @@ class SSACFG
 	}
 	ValueId newLiteral(langutil::DebugData::ConstPtr _debugData, u256 _value)
 	{
-		auto [it, inserted] = m_literals.emplace(_value, SSACFG::ValueId{m_valueInfos.size()});
+		auto [it, inserted] = m_literals.emplace(_value, ValueId{m_valueInfos.size()});
 		if (inserted)
 			m_valueInfos.emplace_back(LiteralValue{std::move(_debugData), _value});
 		else