Remove EOF: libyul

Author: rodiazet

libevmasm/Assembly.cpp

@@ -1730,11 +1730,7 @@ LinkerObject const& Assembly::assembleEOF() const
 		if (ret.bytecode.size() - sectionStart > std::numeric_limits<uint16_t>::max())
 			// TODO: Include source location. Note that origin locations we have in debug data are
 			// not usable for error reporting when compiling pure Yul because they point at the optimized source.
-			throw Error(
-				2202_error,
-				Error::Type::CodeGenerationError,
-				"Code section too large for EOF."
-			);
+			solAssert(false, "Code section too large for EOF.");
 		setBigEndianUint16(ret.bytecode, codeSectionSizePositions[codeSectionIndex], ret.bytecode.size() - sectionStart);
 
 		ret.codeSectionLocations.push_back(LinkerObject::CodeSectionLocation{
@@ -1789,9 +1785,8 @@ LinkerObject const& Assembly::assembleEOF() const
 	auto const preDeployAndStaticAuxDataSize = preDeployDataSectionSize + staticAuxDataSize;
 
 	if (preDeployAndStaticAuxDataSize > std::numeric_limits<uint16_t>::max())
-		throw Error(
-			3965_error,
-			Error::Type::CodeGenerationError,
+		solAssert(
+			false,
 			"The highest accessed data offset exceeds the maximum possible size of the static auxdata section."
 		);
 

liblangutil/EVMVersion.cpp

@@ -26,28 +26,25 @@ using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
 
-bool EVMVersion::hasOpcode(Instruction _opcode, std::optional<uint8_t> _eofVersion) const
+bool EVMVersion::hasOpcode(Instruction _opcode) const
 {
-	// EOF version can be only defined since osaka
-	assert(!_eofVersion.has_value() || *this >= EVMVersion::firstWithEOF());
-
 	switch (_opcode)
 	{
 	case Instruction::RETURNDATACOPY:
 	case Instruction::RETURNDATASIZE:
 		return supportsReturndata();
 	case Instruction::STATICCALL:
-		return !_eofVersion.has_value() && hasStaticCall();
+		return hasStaticCall();
 	case Instruction::SHL:
 	case Instruction::SHR:
 	case Instruction::SAR:
 		return hasBitwiseShifting();
 	case Instruction::CLZ:
 		return hasCLZ();
 	case Instruction::CREATE2:
-		return !_eofVersion.has_value() && hasCreate2();
+		return hasCreate2();
 	case Instruction::EXTCODEHASH:
-		return !_eofVersion.has_value() && hasExtCodeHash();
+		return hasExtCodeHash();
 	case Instruction::CHAINID:
 		return hasChainID();
 	case Instruction::SELFBALANCE:
@@ -63,21 +60,6 @@ bool EVMVersion::hasOpcode(Instruction _opcode, std::optional<uint8_t> _eofVersi
 	case Instruction::TSTORE:
 	case Instruction::TLOAD:
 		return supportsTransientStorage();
-	// Instructions below are deprecated in EOF
-	case Instruction::CALL:
-	case Instruction::CALLCODE:
-	case Instruction::DELEGATECALL:
-	case Instruction::SELFDESTRUCT:
-	case Instruction::JUMP:
-	case Instruction::JUMPI:
-	case Instruction::PC:
-	case Instruction::CREATE:
-	case Instruction::CODESIZE:
-	case Instruction::CODECOPY:
-	case Instruction::EXTCODESIZE:
-	case Instruction::EXTCODECOPY:
-	case Instruction::GAS:
-		return !_eofVersion.has_value();
 	// Instructions below available only in EOF
 	case Instruction::EOFCREATE:
 	case Instruction::RETURNCONTRACT:
@@ -92,7 +74,7 @@ bool EVMVersion::hasOpcode(Instruction _opcode, std::optional<uint8_t> _eofVersi
 	case Instruction::EXTCALL:
 	case Instruction::EXTSTATICCALL:
 	case Instruction::EXTDELEGATECALL:
-		return _eofVersion.has_value();
+		return false;
 	default:
 		return true;
 	}

liblangutil/EVMVersion.h

@@ -86,14 +86,6 @@ class EVMVersion
 		};
 	}
 
-	static auto constexpr allEOFVersions()
-	{
-		return std::array{
-			std::optional<uint8_t>(),
-			std::make_optional<uint8_t>(1)
-		};
-	}
-
 	static std::optional<EVMVersion> fromString(std::string const& _version)
 	{
 		for (auto const& v: allVersions())
@@ -102,8 +94,6 @@ class EVMVersion
 		return std::nullopt;
 	}
 
-	static EVMVersion firstWithEOF() { return {Version::Osaka}; }
-
 	bool isExperimental() const {
 		solAssert(Version::Future > currentVersion);
 		return m_version > currentVersion;
@@ -150,10 +140,9 @@ class EVMVersion
 	bool hasBlobHash() const { return *this >= cancun(); }
 	bool hasMcopy() const { return *this >= cancun(); }
 	bool supportsTransientStorage() const { return *this >= cancun(); }
-	bool supportsEOF() const { return *this >= firstWithEOF(); }
 	constexpr size_t reachableStackDepth() const { return 16; }
 
-	bool hasOpcode(evmasm::Instruction _opcode, std::optional<uint8_t> _eofVersion) const;
+	bool hasOpcode(evmasm::Instruction _opcode) const;
 
 	/// Whether we have to retain the costs for the call opcode itself (false),
 	/// or whether we can just forward easily all remaining gas (true).

libsolidity/ast/ASTJsonImporter.cpp

@@ -735,7 +735,7 @@ ASTPointer<InlineAssembly> ASTJsonImporter::createInlineAssembly(Json const& _no
 	astAssert(evmVersion.has_value(), "Invalid EVM version!");
 	astAssert(m_evmVersion == evmVersion, "Imported tree evm version differs from configured evm version!");
 
-	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(evmVersion.value(), std::nullopt);
+	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(evmVersion.value());
 	ASTPointer<std::vector<ASTPointer<ASTString>>> flags;
 	if (_node.contains("flags"))
 	{

libsolidity/codegen/CompilerContext.cpp

@@ -436,7 +436,7 @@ void CompilerContext::appendInlineAssembly(
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
 	langutil::CharStream charStream(_assembly, _sourceName);
-	yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion, std::nullopt);
+	yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
 	std::optional<langutil::SourceLocation> locationOverride;
 	if (!_system)
 		locationOverride = m_asm->currentSourceLocation();
@@ -521,7 +521,6 @@ void CompilerContext::appendInlineAssembly(
 		analysisInfo,
 		*m_asm,
 		m_evmVersion,
-		std::nullopt,
 		identifierAccess.generateCode,
 		_system,
 		_optimiserSettings.optimizeStackAllocation

libsolidity/codegen/ContractCompiler.cpp

@@ -958,7 +958,6 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 		*analysisInfo,
 		*m_context.assemblyPtr(),
 		m_context.evmVersion(),
-		std::nullopt,
 		identifierAccessCodeGen,
 		false,
 		m_optimiserSettings.optimizeStackAllocation

libsolidity/interface/CompilerStack.cpp

@@ -848,7 +848,6 @@ YulStack CompilerStack::loadGeneratedIR(std::string const& _ir) const
 {
 	YulStack stack(
 		m_evmVersion,
-		std::nullopt,
 		m_optimiserSettings,
 		m_debugInfoSelection,
 		this, // _soliditySourceProvider
@@ -937,7 +936,7 @@ Json CompilerStack::generatedSources(std::string const& _contractName, bool _run
 			ErrorList errors;
 			ErrorReporter errorReporter(errors);
 			CharStream charStream(source, sourceName);
-			yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion, std::nullopt);
+			yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
 			std::shared_ptr<yul::AST> parserResult = yul::Parser{errorReporter, dialect}.parse(charStream);
 			solAssert(parserResult);
 			sources[0]["ast"] = yul::AsmJsonConverter{dialect, sourceIndex}(parserResult->root());

libsolidity/interface/StandardCompiler.cpp

@@ -1780,7 +1780,6 @@ Json StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 
 	YulStack stack(
 		_inputsAndSettings.evmVersion,
-		std::nullopt,
 		_inputsAndSettings.optimiserSettings,
 		_inputsAndSettings.debugInfoSelection.has_value() ?
 			_inputsAndSettings.debugInfoSelection.value() :

libsolidity/parsing/Parser.cpp

@@ -1518,7 +1518,7 @@ ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> con
 	SourceLocation location = currentLocation();
 
 	expectToken(Token::Assembly);
-	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion, std::nullopt);
+	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
 	if (m_scanner->currentToken() == Token::StringLiteral)
 	{
 		if (m_scanner->currentLiteral() != "evmasm")