Yul: Immutable AST class with top-level block

Author: clonker

libsolidity/analysis/ControlFlowBuilder.cpp

@@ -451,7 +451,7 @@ bool ControlFlowBuilder::visit(InlineAssembly const& _inlineAssembly)
 	solAssert(!!m_currentNode && !m_inlineAssembly, "");
 
 	m_inlineAssembly = &_inlineAssembly;
-	(*this)(_inlineAssembly.operations());
+	(*this)(_inlineAssembly.operations().block());
 	m_inlineAssembly = nullptr;
 
 	return false;

libsolidity/analysis/PostTypeChecker.cpp

@@ -506,7 +506,7 @@ class LValueChecker: public ASTConstVisitor
 			return;
 
 		YulLValueChecker yulChecker{m_declaration->name()};
-		yulChecker(_inlineAssembly.operations());
+		yulChecker(_inlineAssembly.operations().block());
 		m_willBeWrittenTo = yulChecker.willBeWrittenTo();
 	}
 private:

libsolidity/analysis/ReferencesResolver.cpp

@@ -236,7 +236,7 @@ bool ReferencesResolver::visit(UsingForDirective const& _usingFor)
 bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly)
 {
 	m_yulAnnotation = &_inlineAssembly.annotation();
-	(*this)(_inlineAssembly.operations());
+	(*this)(_inlineAssembly.operations().block());
 	m_yulAnnotation = nullptr;
 
 	return false;

libsolidity/analysis/SyntaxChecker.cpp

@@ -354,7 +354,7 @@ bool SyntaxChecker::visit(InlineAssembly const& _inlineAssembly)
 	if (!m_useYulOptimizer)
 		return false;
 
-	if (yul::MSizeFinder::containsMSize(_inlineAssembly.dialect(), _inlineAssembly.operations()))
+	if (yul::MSizeFinder::containsMSize(_inlineAssembly.dialect(), _inlineAssembly.operations().block()))
 		m_errorReporter.syntaxError(
 			6553_error,
 			_inlineAssembly.location(),

libsolidity/analysis/TypeChecker.cpp

@@ -947,7 +947,7 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 		_inlineAssembly.dialect(),
 		identifierAccess
 	);
-	if (!analyzer.analyze(_inlineAssembly.operations()))
+	if (!analyzer.analyze(_inlineAssembly.operations().block()))
 		solAssert(m_errorReporter.hasErrors());
 	_inlineAssembly.annotation().hasMemoryEffects =
 		lvalueAccessToMemoryVariable ||

libsolidity/analysis/ViewPureChecker.cpp

@@ -226,7 +226,7 @@ void ViewPureChecker::endVisit(InlineAssembly const& _inlineAssembly)
 	AssemblyViewPureChecker{
 		_inlineAssembly.dialect(),
 		[&](StateMutability _mutability, SourceLocation const& _location) { reportMutability(_mutability, _location); }
-	}(_inlineAssembly.operations());
+	}(_inlineAssembly.operations().block());
 }
 
 void ViewPureChecker::reportMutability(

libsolidity/ast/AST.h

@@ -48,7 +48,7 @@
 namespace solidity::yul
 {
 // Forward-declaration to <yul/AST.h>
-struct Block;
+class AST;
 struct Dialect;
 }
 
@@ -1569,7 +1569,7 @@ class InlineAssembly: public Statement
 		ASTPointer<ASTString> const& _docString,
 		yul::Dialect const& _dialect,
 		ASTPointer<std::vector<ASTPointer<ASTString>>> _flags,
-		std::shared_ptr<yul::Block> _operations
+		std::shared_ptr<yul::AST> _operations
 	):
 		Statement(_id, _location, _docString),
 		m_dialect(_dialect),
@@ -1580,15 +1580,15 @@ class InlineAssembly: public Statement
 	void accept(ASTConstVisitor& _visitor) const override;
 
 	yul::Dialect const& dialect() const { return m_dialect; }
-	yul::Block const& operations() const { return *m_operations; }
+	yul::AST const& operations() const { return *m_operations; }
 	ASTPointer<std::vector<ASTPointer<ASTString>>> const& flags() const { return m_flags; }
 
 	InlineAssemblyAnnotation& annotation() const override;
 
 private:
 	yul::Dialect const& m_dialect;
 	ASTPointer<std::vector<ASTPointer<ASTString>>> m_flags;
-	std::shared_ptr<yul::Block> m_operations;
+	std::shared_ptr<yul::AST> m_operations;
 };
 
 /**

libsolidity/ast/ASTJsonExporter.cpp

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

libsolidity/ast/ASTJsonImporter.cpp

@@ -733,7 +733,7 @@ ASTPointer<InlineAssembly> ASTJsonImporter::createInlineAssembly(Json const& _no
 			flags->emplace_back(std::make_shared<ASTString>(flag.get<std::string>()));
 		}
 	}
-	std::shared_ptr<yul::Block> operations = std::make_shared<yul::Block>(yul::AsmJsonImporter(m_sourceNames).createBlock(member(_node, "AST")));
+	std::shared_ptr<yul::AST> operations = std::make_shared<yul::AST>(yul::AsmJsonImporter(m_sourceNames).createAST(member(_node, "AST")));
 	return createASTNode<InlineAssembly>(
 		_node,
 		nullOrASTString(_node, "documentation"),

libsolidity/codegen/CompilerContext.cpp

@@ -440,7 +440,7 @@ void CompilerContext::appendInlineAssembly(
 	std::optional<langutil::SourceLocation> locationOverride;
 	if (!_system)
 		locationOverride = m_asm->currentSourceLocation();
-	std::shared_ptr<yul::Block> parserResult =
+	std::shared_ptr<yul::AST> parserResult =
 		yul::Parser(errorReporter, dialect, std::move(locationOverride))
 		.parse(charStream);
 #ifdef SOL_OUTPUT_ASM
@@ -472,7 +472,7 @@ void CompilerContext::appendInlineAssembly(
 			errorReporter,
 			dialect,
 			identifierAccess.resolve
-		).analyze(*parserResult);
+		).analyze(parserResult->block());
 	if (!parserResult || !errorReporter.errors().empty() || !analyzerResult)
 		reportError("Invalid assembly generated by code generator.");
 
@@ -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(dialect)(*obj.code);
-			std::string code = yul::AsmPrinter{dialect}(*obj.code);
+			m_generatedYulUtilityCode = yul::AsmPrinter(dialect)(obj.code->block());
+			std::string code = yul::AsmPrinter{dialect}(obj.code->block());
 			langutil::CharStream charStream(m_generatedYulUtilityCode, _sourceName);
 			obj.code = yul::Parser(errorReporter, dialect).parse(charStream);
 			*obj.analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(dialect, obj);
@@ -518,7 +518,7 @@ void CompilerContext::appendInlineAssembly(
 
 	solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block.");
 	yul::CodeGenerator::assemble(
-		*parserResult,
+		parserResult->block(),
 		analysisInfo,
 		*m_asm,
 		m_evmVersion,