interpreter uses yul AST instead of separate block and dialect

Author: clonker

test/libyul/YulInterpreterTest.cpp

@@ -80,8 +80,7 @@ std::string YulInterpreterTest::interpret(std::shared_ptr<Object const> const& _
 	{
 		Interpreter::run(
 			state,
-			*_object->dialect(),
-			_object->code()->root(),
+			*_object->code(),
 			/*disableExternalCalls=*/ !m_simulateExternalCallsToSelf,
 			/*disableMemoryTracing=*/ false
 		);

test/tools/yulInterpreter/Inspector.cpp

@@ -31,9 +31,9 @@ using namespace solidity::yul::test;
 namespace
 {
 
-void printVariable(YulString const& _name, u256 const& _value)
+void printVariable(std::string_view const _name, u256 const& _value)
 {
-	std::cout << "\t" << _name.str() << " = " << _value.str();
+	std::cout << "\t" << _name << " = " << _value.str();
 
 	if (_value != 0)
 		std::cout << " (" << toCompactHexWithPrefix(_value) << ")";
@@ -46,17 +46,16 @@ void printVariable(YulString const& _name, u256 const& _value)
 void InspectedInterpreter::run(
 	std::shared_ptr<Inspector> _inspector,
 	InterpreterState& _state,
-	Dialect const& _dialect,
-	Block const& _ast,
+	AST const& _ast,
 	bool _disableExternalCalls,
 	bool _disableMemoryTrace
 )
 {
 	Scope scope;
-	InspectedInterpreter{_inspector, _state, _dialect, scope, _disableExternalCalls, _disableMemoryTrace}(_ast);
+	InspectedInterpreter{_inspector, _state, _ast.dialect(), scope, _disableExternalCalls, _disableMemoryTrace}(_ast.root());
 }
 
-Inspector::NodeAction Inspector::queryUser(langutil::DebugData const& _data, std::map<YulString, u256> const& _variables)
+Inspector::NodeAction Inspector::queryUser(langutil::DebugData const& _data, std::map<YulName, u256> const& _variables)
 {
 	if (m_stepMode == NodeAction::RunNode)
 	{
@@ -99,7 +98,7 @@ Inspector::NodeAction Inspector::queryUser(langutil::DebugData const& _data, std
 		else if (input == "variables" || input == "v")
 		{
 			for (auto &&[yulStr, val]: _variables)
-				printVariable(yulStr, val);
+				printVariable(yulStr.str(), val);
 			std::cout << std::endl;
 		}
 		else if (
@@ -120,7 +119,7 @@ Inspector::NodeAction Inspector::queryUser(langutil::DebugData const& _data, std
 			for (auto &&[yulStr, val]: _variables)
 				if (yulStr.str() == varname)
 				{
-					printVariable(yulStr, val);
+					printVariable(varname, val);
 					found = true;
 					break;
 				}

test/tools/yulInterpreter/Inspector.h

@@ -103,8 +103,7 @@ class InspectedInterpreter: public Interpreter
 	static void run(
 		std::shared_ptr<Inspector> _inspector,
 		InterpreterState& _state,
-		Dialect const& _dialect,
-		Block const& _ast,
+		AST const& _ast,
 		bool _disableExternalCalls,
 		bool _disableMemoryTracing
 	);

test/tools/yulInterpreter/Interpreter.cpp

@@ -109,14 +109,13 @@ void InterpreterState::dumpTraceAndState(std::ostream& _out, bool _disableMemory
 
 void Interpreter::run(
 	InterpreterState& _state,
-	Dialect const& _dialect,
-	Block const& _ast,
+	AST const& _ast,
 	bool _disableExternalCalls,
 	bool _disableMemoryTrace
 )
 {
 	Scope scope;
-	Interpreter{_state, _dialect, scope, _disableExternalCalls, _disableMemoryTrace}(_ast);
+	Interpreter{_state, _ast.dialect(), scope, _disableExternalCalls, _disableMemoryTrace}(_ast.root());
 }
 
 void Interpreter::operator()(ExpressionStatement const& _expressionStatement)

test/tools/yulInterpreter/Interpreter.h

@@ -22,6 +22,7 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
+#include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/optimiser/ASTWalker.h>
 
 #include <libevmasm/Instruction.h>
@@ -162,8 +163,7 @@ class Interpreter: public ASTWalker
 	/// activated e.g., Redundant store eliminator, Equal store eliminator.
 	static void run(
 		InterpreterState& _state,
-		Dialect const& _dialect,
-		Block const& _ast,
+		AST const& _ast,
 		bool _disableExternalCalls,
 		bool _disableMemoryTracing
 	);