Merge pull request ethereum#11797 from ethereum/optimizedEVMCodeTrans…

…form Optimized EVM Code Transform. (New Code Transform Step 3)
CNFS-Tech · Sep 14, 2021 · a35608a · a35608a
2 parents cb218fe + 75c3286
commit a35608a
Show file tree

Hide file tree

Showing 4 changed files with 632 additions and 9 deletions.
diff --git a/libyul/AST.h b/libyul/AST.h
@@ -83,18 +83,16 @@ struct Continue { std::shared_ptr<DebugData const> debugData; };
 /// Leave statement (valid within function)
 struct Leave { std::shared_ptr<DebugData const> debugData; };
 
-struct LocationExtractor
+/// Extracts the source location from a Yul node.
+template <class T> inline langutil::SourceLocation locationOf(T const& _node)
 {
-	template <class T> langutil::SourceLocation operator()(T const& _node) const
-	{
-		return _node.debugData ? _node.debugData->location : langutil::SourceLocation{};
-	}
-};
+	return _node.debugData ? _node.debugData->location : langutil::SourceLocation{};
+}
 
 /// Extracts the source location from a Yul node.
-template <class T> inline langutil::SourceLocation locationOf(T const& _node)
+template <class... Args> inline langutil::SourceLocation locationOf(std::variant<Args...> const& _node)
 {
-	return std::visit(LocationExtractor(), _node);
+	return std::visit([](auto const& _arg) { return locationOf(_arg); }, _node);
 }
 
 struct DebugDataExtractor

diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
@@ -68,9 +68,11 @@ add_library(yul
 	backends/evm/EVMMetrics.h
 	backends/evm/NoOutputAssembly.h
 	backends/evm/NoOutputAssembly.cpp
+	backends/evm/OptimizedEVMCodeTransform.cpp
+	backends/evm/OptimizedEVMCodeTransform.h
 	backends/evm/StackHelpers.h
-	backends/evm/StackLayoutGenerator.h
 	backends/evm/StackLayoutGenerator.cpp
+	backends/evm/StackLayoutGenerator.h
 	backends/evm/VariableReferenceCounter.h
 	backends/evm/VariableReferenceCounter.cpp
 	backends/wasm/EVMToEwasmTranslator.cpp