eof: Add better message when EOF builtin used in legcy

Author: rodiazet

libyul/AsmAnalysis.cpp

@@ -695,11 +695,28 @@ bool AsmAnalyzer::validateInstructions(std::string_view _instructionIdentifier,
 	if (builtinHandle && defaultEVMDialect.builtin(*builtinHandle).instruction.has_value())
 		return validateInstructions(*defaultEVMDialect.builtin(*builtinHandle).instruction, _location);
 
+	solAssert(!m_eofVersion.has_value() || (*m_eofVersion == 1 && m_evmVersion == langutil::EVMVersion::prague()));
 	// TODO: Change `prague()` to `EVMVersion{}` once EOF gets deployed
 	auto const& eofDialect = EVMDialect::strictAssemblyForEVM(EVMVersion::prague(), 1);
 	auto const eofBuiltinHandle = eofDialect.findBuiltin(_instructionIdentifier);
-	if (eofBuiltinHandle && eofDialect.builtin(*eofBuiltinHandle).instruction.has_value())
-		return validateInstructions(*eofDialect.builtin(*eofBuiltinHandle).instruction, _location);
+	if (eofBuiltinHandle)
+	{
+		auto const builtin = eofDialect.builtin(*eofBuiltinHandle);
+		if (builtin.instruction.has_value())
+			return validateInstructions(*builtin.instruction, _location);
+		else if (!m_eofVersion.has_value())
+		{
+			m_errorReporter.declarationError(
+				7223_error,
+				_location,
+				fmt::format(
+					"Builtin function \"{}\" is only available in EOF.",
+					fmt::arg("function", _instructionIdentifier)
+				)
+			);
+			return true;
+		}
+	}
 
 	return false;
 }
@@ -716,8 +733,16 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 	yulAssert(
 		_instr != evmasm::Instruction::JUMP &&
 		_instr != evmasm::Instruction::JUMPI &&
-		_instr != evmasm::Instruction::JUMPDEST,
-	"");
+		_instr != evmasm::Instruction::JUMPDEST &&
+		_instr != evmasm::Instruction::DATALOADN &&
+		_instr != evmasm::Instruction::EOFCREATE &&
+		_instr != evmasm::Instruction::RETURNCONTRACT &&
+		_instr != evmasm::Instruction::RJUMP &&
+		_instr != evmasm::Instruction::RJUMPI &&
+		_instr != evmasm::Instruction::CALLF &&
+		_instr != evmasm::Instruction::JUMPF &&
+		_instr != evmasm::Instruction::RETF
+	);
 
 	auto errorForVM = [&](ErrorId _errorId, std::string const& vmKindMessage) {
 		m_errorReporter.typeError(