Yul: Object contains dialect

libsolidity/ast/ASTJsonExporter.cpp

@@ -667,7 +667,7 @@ bool ASTJsonExporter::visit(InlineAssembly const& _node)
 	auto const& evmDialect = dynamic_cast<solidity::yul::EVMDialect const&>(_node.dialect());
 
 	std::vector<std::pair<std::string, Json>> attributes = {
-		std::make_pair("AST", Json(yul::AsmJsonConverter(sourceIndexFromLocation(_node.location()))(_node.operations().root()))),
+		std::make_pair("AST", Json(yul::AsmJsonConverter(evmDialect, sourceIndexFromLocation(_node.location()))(_node.operations().root()))),
 		std::make_pair("externalReferences", std::move(externalReferencesJson)),
 		std::make_pair("evmVersion", evmDialect.evmVersion().name())
 	};

libsolidity/codegen/CompilerContext.cpp

@@ -481,7 +481,7 @@ void CompilerContext::appendInlineAssembly(
 	// so we essentially only optimize the ABI functions.
 	if (_optimiserSettings.runYulOptimiser && _localVariables.empty())
 	{
-		yul::Object obj;
+		yul::Object obj{dialect};
 		obj.setCode(parserResult, std::make_shared<yul::AsmAnalysisInfo>(analysisInfo));
 
 		solAssert(!dialect.providesObjectAccess());
@@ -491,8 +491,8 @@ void CompilerContext::appendInlineAssembly(
 		{
 			// Store as generated sources, but first re-parse to update the source references.
 			solAssert(m_generatedYulUtilityCode.empty(), "");
-			m_generatedYulUtilityCode = yul::AsmPrinter()(obj.code()->root());
-			std::string code = yul::AsmPrinter{}(obj.code()->root());
+			m_generatedYulUtilityCode = yul::AsmPrinter(obj.dialect())(obj.code()->root());
+			std::string code = yul::AsmPrinter{obj.dialect()}(obj.code()->root());
 			langutil::CharStream charStream(m_generatedYulUtilityCode, _sourceName);
 			obj.setCode(yul::Parser(errorReporter, dialect).parse(charStream));
 			obj.analysisInfo = std::make_shared<yul::AsmAnalysisInfo>(yul::AsmAnalyzer::analyzeStrictAssertCorrect(dialect, obj));

libsolidity/codegen/ContractCompiler.cpp

@@ -932,7 +932,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 
 	// Only used in the scope below, but required to live outside to keep the
 	// std::shared_ptr's alive
-	yul::Object object = {};
+	yul::Object object{_inlineAssembly.dialect()};
 
 	// The optimiser cannot handle external references
 	if (

libsolidity/codegen/ir/IRGeneratorForStatements.cpp

@@ -2258,7 +2258,7 @@ bool IRGeneratorForStatements::visit(InlineAssembly const& _inlineAsm)
 
 	solAssert(std::holds_alternative<yul::Block>(modified));
 
-	appendCode() << yul::AsmPrinter()(std::get<yul::Block>(modified)) << "\n";
+	appendCode() << yul::AsmPrinter(_inlineAsm.dialect())(std::get<yul::Block>(modified)) << "\n";
 	return false;
 }
 

libsolidity/experimental/codegen/IRGeneratorForStatements.cpp

@@ -132,7 +132,7 @@ bool IRGeneratorForStatements::visit(InlineAssembly const& _assembly)
 	CopyTranslate bodyCopier{m_context, _assembly.dialect(), _assembly.annotation().externalReferences};
 	yul::Statement modified = bodyCopier(_assembly.operations().root());
 	solAssert(std::holds_alternative<yul::Block>(modified));
-	m_code << yul::AsmPrinter()(std::get<yul::Block>(modified)) << "\n";
+	m_code << yul::AsmPrinter(_assembly.dialect())(std::get<yul::Block>(modified)) << "\n";
 	return false;
 }
 

libsolidity/interface/CompilerStack.cpp

@@ -900,7 +900,7 @@ Json CompilerStack::generatedSources(std::string const& _contractName, bool _run
 			yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion, m_eofVersion);
 			std::shared_ptr<yul::AST> parserResult = yul::Parser{errorReporter, dialect}.parse(charStream);
 			solAssert(parserResult);
-			sources[0]["ast"] = yul::AsmJsonConverter{sourceIndex}(parserResult->root());
+			sources[0]["ast"] = yul::AsmJsonConverter{dialect, sourceIndex}(parserResult->root());
 			sources[0]["name"] = sourceName;
 			sources[0]["id"] = sourceIndex;
 			sources[0]["language"] = "Yul";

libyul/AsmJsonConverter.h

@@ -33,6 +33,8 @@
 namespace solidity::yul
 {
 
+struct Dialect;
+
 /**
  * Converter of the yul AST into JSON format
  */
@@ -41,7 +43,7 @@ class AsmJsonConverter: public boost::static_visitor<Json>
 public:
 	/// Create a converter to JSON for any block of inline assembly
 	/// @a _sourceIndex to be used to abbreviate source name in the source locations
-	explicit AsmJsonConverter(std::optional<size_t> _sourceIndex): m_sourceIndex(_sourceIndex) {}
+	explicit AsmJsonConverter(Dialect const&, std::optional<size_t> _sourceIndex): m_sourceIndex(_sourceIndex) {}
 
 	Json operator()(Block const& _node) const;
 	Json operator()(NameWithDebugData const& _node) const;

libyul/AsmPrinter.h

@@ -37,6 +37,8 @@
 namespace solidity::yul
 {
 
+struct Dialect;
+
 /**
  * Converts a parsed Yul AST into readable string representation.
  * Ignores source locations.
@@ -45,6 +47,7 @@ class AsmPrinter
 {
 public:
 	explicit AsmPrinter(
+		Dialect const&,
 		std::optional<std::map<unsigned, std::shared_ptr<std::string const>>> _sourceIndexToName = {},
 		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
 		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr

libyul/Object.cpp

@@ -52,6 +52,7 @@ std::string Object::toString(
 	yulAssert(debugData, "No debug data");
 
 	std::string inner = "code " + AsmPrinter(
+		m_dialect,
 		debugData->sourceNames,
 		_debugInfoSelection,
 		_soliditySourceProvider
@@ -96,7 +97,7 @@ Json Object::toJson() const
 
 	Json codeJson;
 	codeJson["nodeType"] = "YulCode";
-	codeJson["block"] = AsmJsonConverter(0 /* sourceIndex */)(code()->root());
+	codeJson["block"] = AsmJsonConverter(m_dialect, 0 /* sourceIndex */)(code()->root());
 
 	Json subObjectsJson = Json::array();
 	for (std::shared_ptr<ObjectNode> const& subObject: subObjects)

libyul/Object.h

@@ -41,7 +41,7 @@ struct AsmAnalysisInfo;
 
 using SourceNameMap = std::map<unsigned, std::shared_ptr<std::string const>>;
 
-struct Object;
+class Object;
 
 /**
  * Generic base class for both Yul objects and Yul data.
@@ -88,9 +88,10 @@ struct ObjectDebugData
 /**
  * Yul code and data object container.
  */
-struct Object: public ObjectNode
+class Object: public ObjectNode
 {
 public:
+	explicit Object(Dialect const& _dialect): m_dialect(_dialect) {}
 	/// @returns a (parseable) string representation.
 	std::string toString(
 		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
@@ -139,7 +140,10 @@ struct Object: public ObjectNode
 	/// @returns the name of the special metadata data object.
 	static std::string metadataName() { return ".metadata"; }
 
+	Dialect const& dialect() const { return m_dialect; }
+
 private:
+	Dialect const& m_dialect;
 	std::shared_ptr<AST const> m_code;
 };
 

libyul/ObjectOptimizer.cpp

@@ -142,6 +142,7 @@ std::optional<h256> ObjectOptimizer::calculateCacheKey(
 )
 {
 	AsmPrinter asmPrinter(
+		languageToDialect(_settings.language, _settings.evmVersion, _settings.eofVersion),
 		_debugData.sourceNames,
 		DebugInfoSelection::All()
 	);

libyul/ObjectParser.cpp

@@ -49,7 +49,7 @@ std::shared_ptr<Object> ObjectParser::parse(std::shared_ptr<Scanner> const& _sca
 		if (currentToken() == Token::LBrace)
 		{
 			// Special case: Code-only form.
-			object = std::make_shared<Object>();
+			object = std::make_shared<Object>(m_dialect);
 			object->name = "object";
 			auto sourceNameMapping = tryParseSourceNameMapping();
 			object->debugData = std::make_shared<ObjectDebugData>(ObjectDebugData{sourceNameMapping});
@@ -74,7 +74,7 @@ std::shared_ptr<Object> ObjectParser::parseObject(Object* _containingObject)
 {
 	RecursionGuard guard(*this);
 
-	std::shared_ptr<Object> ret = std::make_shared<Object>();
+	std::shared_ptr<Object> ret = std::make_shared<Object>(m_dialect);
 
 	auto sourceNameMapping = tryParseSourceNameMapping();
 	ret->debugData = std::make_shared<ObjectDebugData>(ObjectDebugData{sourceNameMapping});

libyul/backends/evm/EVMDialect.h

@@ -34,7 +34,7 @@ namespace solidity::yul
 {
 
 struct FunctionCall;
-struct Object;
+class Object;
 
 /**
  * Context used during code generation.

libyul/backends/evm/EVMObjectCompiler.h

@@ -26,7 +26,7 @@
 
 namespace solidity::yul
 {
-struct Object;
+class Object;
 class AbstractAssembly;
 class EVMDialect;
 

libyul/optimiser/StackCompressor.h

@@ -30,7 +30,7 @@ namespace solidity::yul
 {
 
 struct Dialect;
-struct Object;
+class Object;
 struct FunctionDefinition;
 
 /**

libyul/optimiser/StackLimitEvader.h

@@ -27,7 +27,7 @@
 namespace solidity::yul
 {
 
-struct Object;
+class Object;
 
 /**
  * Optimisation stage that assigns memory offsets to variables that would become unreachable if

libyul/optimiser/Suite.cpp

@@ -486,7 +486,7 @@ void OptimiserSuite::runSequence(std::vector<std::string> const& _steps, Block&
 			else
 			{
 				std::cout << "== Running " << step << " changed the AST." << std::endl;
-				std::cout << AsmPrinter{}(_ast) << std::endl;
+				std::cout << AsmPrinter{m_context.dialect}(_ast) << std::endl;
 				copy = std::make_unique<Block>(std::get<Block>(ASTCopier{}(_ast)));
 			}
 		}

libyul/optimiser/Suite.h

@@ -38,7 +38,7 @@ namespace solidity::yul
 struct AsmAnalysisInfo;
 struct Dialect;
 class GasMeter;
-struct Object;
+class Object;
 
 /**
  * Optimiser suite that combines all steps and also provides the settings for the heuristics.

test/libyul/Common.cpp

@@ -97,9 +97,9 @@ yul::Block yul::test::disambiguate(std::string const& _source)
 	return std::get<Block>(Disambiguator(defaultDialect(), *result.second, {})(result.first->root()));
 }
 
-std::string yul::test::format(std::string const& _source)
+std::string yul::test::format(std::string const& _source, Dialect const& _dialect)
 {
-	return yul::AsmPrinter()(parse(_source).first->root());
+	return yul::AsmPrinter(_dialect)(parse(_source).first->root());
 }
 
 namespace

test/libyul/Common.h

@@ -37,7 +37,7 @@ namespace solidity::yul
 {
 struct AsmAnalysisInfo;
 struct Block;
-struct Object;
+class Object;
 struct Dialect;
 class AST;
 }
@@ -52,7 +52,7 @@ std::pair<std::shared_ptr<Object>, std::shared_ptr<AsmAnalysisInfo>>
 parse(std::string const& _source, Dialect const& _dialect, langutil::ErrorList& _errors);
 
 Block disambiguate(std::string const& _source);
-std::string format(std::string const& _source);
+std::string format(std::string const& _source, Dialect const& _dialect);
 
 solidity::yul::Dialect const& dialect(std::string const& _name, langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion);
 

test/libyul/CompilabilityChecker.cpp

@@ -34,15 +34,15 @@ namespace
 {
 std::string check(std::string const& _input)
 {
-	Object obj;
+	auto const& dialect = EVMDialect::strictAssemblyForEVM(
+			solidity::test::CommonOptions::get().evmVersion(),
+			solidity::test::CommonOptions::get().eofVersion()
+	);
+	Object obj{dialect};
 	auto parsingResult = yul::test::parse(_input);
 	obj.setCode(parsingResult.first, parsingResult.second);
 	BOOST_REQUIRE(obj.hasCode());
-	auto functions = CompilabilityChecker(
-		EVMDialect::strictAssemblyForEVM(
-			solidity::test::CommonOptions::get().evmVersion(),
-			solidity::test::CommonOptions::get().eofVersion()
-		), obj, true).stackDeficit;
+	auto functions = CompilabilityChecker(dialect, obj, true).stackDeficit;
 	std::string out;
 	for (auto const& function: functions)
 		out += function.first.str() + ": " + std::to_string(function.second) + " ";

test/libyul/ControlFlowSideEffectsTest.cpp

@@ -56,15 +56,18 @@ ControlFlowSideEffectsTest::ControlFlowSideEffectsTest(std::string const& _filen
 
 TestCase::TestResult ControlFlowSideEffectsTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
-	Object obj;
+	auto const& dialect = EVMDialect::strictAssemblyForEVMObjects(
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion()
+	);
+	Object obj{dialect};
 	auto parsingResult = yul::test::parse(m_source);
 	obj.setCode(parsingResult.first, parsingResult.second);
 	if (!obj.hasCode())
 		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
 
 	ControlFlowSideEffectsCollector sideEffects(
-		EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion(),
-			solidity::test::CommonOptions::get().eofVersion()),
+		dialect,
 		obj.code()->root()
 	);
 	m_obtainedResult.clear();

test/libyul/FunctionSideEffects.cpp

@@ -82,15 +82,18 @@ FunctionSideEffects::FunctionSideEffects(std::string const& _filename):
 
 TestCase::TestResult FunctionSideEffects::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
-	Object obj;
+	auto const& dialect = EVMDialect::strictAssemblyForEVMObjects(
+		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion()
+	);
+	Object obj{dialect};
 	auto parsingResult = yul::test::parse(m_source);
 	obj.setCode(parsingResult.first, parsingResult.second);
 	if (!obj.hasCode())
 		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
 
 	std::map<YulName, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
-		EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion(),
-			solidity::test::CommonOptions::get().eofVersion()),
+		dialect,
 		CallGraphGenerator::callGraph(obj.code()->root())
 	);
 

test/libyul/YulOptimizerTest.cpp

@@ -85,7 +85,7 @@ TestCase::TestResult YulOptimizerTest::run(std::ostream& _stream, std::string co
 	auto optimizedObject = tester.optimizedObject();
 	std::string printedOptimizedObject;
 	if (optimizedObject->subObjects.empty())
-		printedOptimizedObject = AsmPrinter{}(optimizedObject->code()->root());
+		printedOptimizedObject = AsmPrinter{optimizedObject->dialect()}(optimizedObject->code()->root());
 	else
 		printedOptimizedObject = optimizedObject->toString();
 

test/libyul/YulOptimizerTest.h

@@ -29,7 +29,7 @@ using ErrorList = std::vector<std::shared_ptr<Error const>>;
 namespace solidity::yul
 {
 struct AsmAnalysisInfo;
-struct Object;
+class Object;
 struct Dialect;
 }
 

test/libyul/YulOptimizerTestCommon.h

@@ -29,7 +29,7 @@
 namespace solidity::yul
 {
 struct AsmAnalysisInfo;
-struct Object;
+class Object;
 struct Dialect;
 class AST;
 }

test/tools/yulopti.cpp

@@ -180,7 +180,7 @@ class YulOpti
 		parse(_source);
 		disambiguate();
 		OptimiserSuite{m_context}.runSequence(_steps, *m_astRoot);
-		std::cout << AsmPrinter{}(*m_astRoot) << std::endl;
+		std::cout << AsmPrinter{m_dialect}(*m_astRoot) << std::endl;
 	}
 
 	void runInteractive(std::string _source, bool _disambiguated = false)
@@ -217,7 +217,7 @@ class YulOpti
 						break;
 					case ';':
 					{
-						Object obj;
+						Object obj{m_dialect};
 						obj.setCode(std::make_shared<AST>(std::get<yul::Block>(ASTCopier{}(*m_astRoot))));
 						*m_astRoot = std::get<1>(StackCompressor::run(m_dialect, obj, true, 16));
 						break;
@@ -228,7 +228,7 @@ class YulOpti
 							*m_astRoot
 						);
 				}
-				_source = AsmPrinter{}(*m_astRoot);
+				_source = AsmPrinter{m_dialect}(*m_astRoot);
 			}
 			catch (...)
 			{

tools/yulPhaser/Program.cpp

@@ -106,12 +106,12 @@ void Program::optimise(std::vector<std::string> const& _optimisationSteps)
 
 std::ostream& phaser::operator<<(std::ostream& _stream, Program const& _program)
 {
-	return _stream << AsmPrinter()(_program.m_ast->root());
+	return _stream << AsmPrinter(_program.m_dialect)(_program.m_ast->root());
 }
 
 std::string Program::toJson() const
 {
-	Json serializedAst = AsmJsonConverter(0)(m_ast->root());
+	Json serializedAst = AsmJsonConverter(m_dialect, 0)(m_ast->root());
 	return jsonPrettyPrint(removeNullMembers(std::move(serializedAst)));
 }