WIP

libyul/AsmAnalysis.cpp

@@ -625,12 +625,15 @@ void AsmAnalyzer::expectValidIdentifier(YulName _identifier, SourceLocation cons
 bool AsmAnalyzer::validateInstructions(std::string const& _instructionIdentifier, langutil::SourceLocation const& _location)
 {
 	// NOTE: This function uses the default EVM version instead of the currently selected one.
-	// TODO: Add EOF support
 	auto const builtin = EVMDialect::strictAssemblyForEVM(EVMVersion{}, std::nullopt).builtin(YulName(_instructionIdentifier));
 	if (builtin && builtin->instruction.has_value())
 		return validateInstructions(builtin->instruction.value(), _location);
-	else
-		return false;
+
+	auto const eofBuiltin = EVMDialect::strictAssemblyForEVM(EVMVersion::prague(), 1).builtin(YulName(_instructionIdentifier));
+	if (eofBuiltin && eofBuiltin->instruction.has_value())
+		return validateInstructions(eofBuiltin->instruction.value(), _location);
+
+	return false;
 }
 
 bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocation const& _location)
@@ -702,6 +705,35 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 			"PC instruction is a low-level EVM feature. "
 			"Because of that PC is disallowed in strict assembly."
 		);
+	else if (m_eofVersion.has_value() &&
+				(
+					_instr == evmasm::Instruction::CALL ||
+					_instr == evmasm::Instruction::CALLCODE ||
+					_instr == evmasm::Instruction::DELEGATECALL ||
+					_instr == evmasm::Instruction::SELFDESTRUCT ||
+					_instr == evmasm::Instruction::JUMP ||
+					_instr == evmasm::Instruction::JUMPI ||
+					_instr == evmasm::Instruction::PC ||
+					_instr == evmasm::Instruction::CREATE ||
+					_instr == evmasm::Instruction::CODESIZE ||
+					_instr == evmasm::Instruction::CODECOPY ||
+					_instr == evmasm::Instruction::EXTCODESIZE ||
+					_instr == evmasm::Instruction::EXTCODECOPY ||
+					_instr == evmasm::Instruction::GAS
+				)
+			)
+	{
+		m_errorReporter.typeError(
+			1234_error,  // TODO: Add error id.
+			_location,
+			fmt::format(
+				"The \"{instruction}\" instruction is {kind} VMs (you are currently compiling for \"{version}\").",
+				fmt::arg("instruction", boost::to_lower_copy(instructionInfo(_instr, m_evmVersion).name)),
+				fmt::arg("kind", "only available in legacy bytecode"),
+				fmt::arg("version", m_evmVersion.name())
+			)
+		);
+	}
 	else
 		return false;
 

libyul/AsmAnalysis.h

@@ -70,7 +70,10 @@ class AsmAnalyzer
 		m_dataNames(std::move(_dataNames))
 	{
 		if (EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&m_dialect))
+		{
 			m_evmVersion = evmDialect->evmVersion();
+			m_eofVersion = evmDialect->eofVersion();
+		}
 	}
 
 	bool analyze(Block const& _block);
@@ -125,6 +128,7 @@ class AsmAnalyzer
 	AsmAnalysisInfo& m_info;
 	langutil::ErrorReporter& m_errorReporter;
 	langutil::EVMVersion m_evmVersion;
+	std::optional<uint8_t> m_eofVersion;
 	Dialect const& m_dialect;
 	/// Names of data objects to be referenced by builtin functions with literal arguments.
 	std::set<std::string> m_dataNames;