Merge pull request #16455 from argotorg/create_ssa_cfg_dot_exporter_base

Introduce DotExporterBase for SSA CFG dot export

Author: clonker

libyul/CMakeLists.txt

@@ -82,18 +82,20 @@ add_library(yul
 	backends/evm/ssa/LivenessAnalysis.h
 	backends/evm/ssa/SSACFGLoopNestingForest.cpp
 	backends/evm/ssa/SSACFGLoopNestingForest.h
-	backends/evm/ssa/SSACFGTopologicalSort.cpp
-	backends/evm/ssa/SSACFGTopologicalSort.h
 	backends/evm/ssa/SSACFG.cpp
 	backends/evm/ssa/SSACFG.h
 	backends/evm/ssa/SSACFGBuilder.cpp
 	backends/evm/ssa/SSACFGBuilder.h
-	backends/evm/ssa/SSACFGJsonExporter.cpp
-	backends/evm/ssa/SSACFGJsonExporter.h
 	backends/evm/ssa/Stack.cpp
 	backends/evm/ssa/Stack.h
 	backends/evm/ssa/StackShuffler.cpp
 	backends/evm/ssa/StackShuffler.h
+	backends/evm/ssa/io/DotExporterBase.cpp
+	backends/evm/ssa/io/DotExporterBase.h
+	backends/evm/ssa/io/JSONExporter.cpp
+	backends/evm/ssa/io/JSONExporter.h
+	backends/evm/ssa/traversal/ForwardTopologicalSort.cpp
+	backends/evm/ssa/traversal/ForwardTopologicalSort.h
 	optimiser/ASTCopier.cpp
 	optimiser/ASTCopier.h
 	optimiser/ASTWalker.cpp

libyul/YulStack.cpp

@@ -21,7 +21,7 @@
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/backends/evm/ssa/SSACFGBuilder.h>
-#include <libyul/backends/evm/ssa/SSACFGJsonExporter.h>
+#include <libyul/backends/evm/ssa/io/JSONExporter.h>
 #include <libyul/backends/evm/EthAssemblyAdapter.h>
 #include <libyul/backends/evm/EVMCodeTransform.h>
 #include <libyul/backends/evm/EVMDialect.h>
@@ -405,7 +405,7 @@ Json YulStack::cfgJson() const
 			keepLiteralAssignments
 		);
 		std::unique_ptr<ssa::ControlFlowLiveness> liveness = std::make_unique<ssa::ControlFlowLiveness>(*controlFlow);
-		return ssa::json::exportControlFlow(*controlFlow, liveness.get());
+		return ssa::io::json::exportControlFlow(*controlFlow, liveness.get());
 	};
 
 	std::function<Json(std::vector<std::shared_ptr<ObjectNode>>)> exportCFGFromSubObjects;

libyul/backends/evm/ssa/JunkAdmittingBlocksFinder.cpp

@@ -23,7 +23,7 @@
 namespace solidity::yul::ssa
 {
 
-JunkAdmittingBlocksFinder::JunkAdmittingBlocksFinder(SSACFG const& _cfg, ForwardSSACFGTopologicalSort const& _topologicalSort):
+JunkAdmittingBlocksFinder::JunkAdmittingBlocksFinder(SSACFG const& _cfg, traversal::ForwardTopologicalSort const& _topologicalSort):
 	m_blockAllowsJunk(_cfg.numBlocks(), false)
 {
 	// special case: only one block here, we mark it as junkable in case it's not a function return

libyul/backends/evm/ssa/JunkAdmittingBlocksFinder.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <libyul/backends/evm/ssa/SSACFGTopologicalSort.h>
+#include <libyul/backends/evm/ssa/traversal/ForwardTopologicalSort.h>
 #include <libyul/backends/evm/ssa/SSACFG.h>
 
 #include <cstdint>
@@ -37,7 +37,7 @@ namespace solidity::yul::ssa
 class JunkAdmittingBlocksFinder
 {
 public:
-	explicit JunkAdmittingBlocksFinder(SSACFG const& _cfg, ForwardSSACFGTopologicalSort const& _topologicalSort);
+	explicit JunkAdmittingBlocksFinder(SSACFG const& _cfg, traversal::ForwardTopologicalSort const& _topologicalSort);
 	bool allowsAdditionOfJunk(SSACFG::BlockId const& _blockId) const;
 private:
 	std::vector<std::uint8_t> m_blockAllowsJunk;

libyul/backends/evm/ssa/LivenessAnalysis.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <libyul/backends/evm/ssa/SSACFGTopologicalSort.h>
+#include <libyul/backends/evm/ssa/traversal/ForwardTopologicalSort.h>
 #include <libyul/backends/evm/ssa/SSACFG.h>
 #include <libyul/backends/evm/ssa/SSACFGLoopNestingForest.h>
 
@@ -107,7 +107,7 @@ class LivenessAnalysis
 	LivenessData const& liveOut(SSACFG::BlockId const _blockId) const { return m_liveOuts[_blockId.value]; }
 	LivenessData used(SSACFG::BlockId _blockId) const;
 	std::vector<LivenessData> const& operationsLiveOut(SSACFG::BlockId _blockId) const { return m_operationLiveOuts[_blockId.value]; }
-	ForwardSSACFGTopologicalSort const& topologicalSort() const { return m_topologicalSort; }
+	traversal::ForwardTopologicalSort const& topologicalSort() const { return m_topologicalSort; }
 	SSACFG const& cfg() const { return m_cfg; }
 
 private:
@@ -117,7 +117,7 @@ class LivenessAnalysis
 	LivenessData blockExitValues(SSACFG::BlockId const& _blockId) const;
 
 	SSACFG const& m_cfg;
-	ForwardSSACFGTopologicalSort m_topologicalSort;
+	traversal::ForwardTopologicalSort m_topologicalSort;
 	SSACFGLoopNestingForest m_loopNestingForest;
 	std::vector<LivenessData> m_liveIns;
 	std::vector<LivenessData> m_liveOuts;