Pass evmVersion to GlobalContext

Author: r0qs

libsolidity/analysis/GlobalContext.cpp

@@ -63,14 +63,21 @@ int magicVariableToID(std::string const& _name)
 	else
 		solAssert(false, "Unknown magic variable: \"" + _name + "\".");
 }
+}
 
-inline std::vector<std::shared_ptr<MagicVariableDeclaration const>> constructMagicVariables()
+GlobalContext::GlobalContext(langutil::EVMVersion _evmVersion):
+	m_evmVersion(_evmVersion),
+	m_magicVariables{constructMagicVariables()}
 {
-	static auto const magicVarDecl = [](std::string const& _name, Type const* _type) {
+}
+
+std::vector<std::shared_ptr<MagicVariableDeclaration const>> GlobalContext::constructMagicVariables() const
+	{
+	static auto const magicVarDecl = [&](std::string const& _name, Type const* _type) {
 		return std::make_shared<MagicVariableDeclaration>(magicVariableToID(_name), _name, _type);
 	};
 
-	return {
+	std::vector<std::shared_ptr<MagicVariableDeclaration const>> magicVariableDeclarations = {
 		magicVarDecl("abi", TypeProvider::magic(MagicType::Kind::ABI)),
 		magicVarDecl("addmod", TypeProvider::function(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Kind::AddMod, StateMutability::Pure)),
 		magicVarDecl("assert", TypeProvider::function(strings{"bool"}, strings{}, FunctionType::Kind::Assert, StateMutability::Pure)),
@@ -92,7 +99,6 @@ inline std::vector<std::shared_ptr<MagicVariableDeclaration const>> constructMag
 		magicVarDecl("sha3", TypeProvider::function(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::KECCAK256, StateMutability::Pure)),
 		magicVarDecl("suicide", TypeProvider::function(strings{"address payable"}, strings{}, FunctionType::Kind::Selfdestruct)),
 		magicVarDecl("tx", TypeProvider::magic(MagicType::Kind::Transaction)),
-		magicVarDecl("blobhash", TypeProvider::function(strings{"uint256"}, strings{"bytes32"}, FunctionType::Kind::BlobHash, StateMutability::View)),
 		// Accepts a MagicType that can be any contract type or an Integer type and returns a
 		// MagicType. The TypeChecker handles the correctness of the input and output types.
 		magicVarDecl("type", TypeProvider::function(
@@ -103,12 +109,13 @@ inline std::vector<std::shared_ptr<MagicVariableDeclaration const>> constructMag
 			FunctionType::Options::withArbitraryParameters()
 		)),
 	};
-}
 
-}
+	if (m_evmVersion >= langutil::EVMVersion::cancun())
+		magicVariableDeclarations.push_back(
+			magicVarDecl("blobhash", TypeProvider::function(strings{"uint256"}, strings{"bytes32"}, FunctionType::Kind::BlobHash, StateMutability::View))
+		);
 
-GlobalContext::GlobalContext(): m_magicVariables{constructMagicVariables()}
-{
+	return magicVariableDeclarations;
 }
 
 void GlobalContext::setCurrentContract(ContractDefinition const& _contract)

libsolidity/analysis/GlobalContext.h

@@ -23,6 +23,7 @@
 
 #pragma once
 
+#include <liblangutil/EVMVersion.h>
 #include <libsolidity/ast/ASTForward.h>
 #include <map>
 #include <memory>
@@ -47,7 +48,8 @@ class GlobalContext
 	GlobalContext(GlobalContext const&) = delete;
 	GlobalContext& operator=(GlobalContext const&) = delete;
 
-	GlobalContext();
+	GlobalContext(langutil::EVMVersion _evmVersion);
+	std::vector<std::shared_ptr<MagicVariableDeclaration const>> constructMagicVariables() const;
 	void setCurrentContract(ContractDefinition const& _contract);
 	void resetCurrentContract() { m_currentContract = nullptr; }
 	MagicVariableDeclaration const* currentThis() const;
@@ -57,6 +59,7 @@ class GlobalContext
 	std::vector<Declaration const*> declarations() const;
 
 private:
+	langutil::EVMVersion m_evmVersion;
 	std::vector<std::shared_ptr<MagicVariableDeclaration const>> m_magicVariables;
 	ContractDefinition const* m_currentContract = nullptr;
 	std::map<ContractDefinition const*, std::shared_ptr<MagicVariableDeclaration const>> mutable m_thisPointer;

libsolidity/analysis/ReferencesResolver.cpp

@@ -404,15 +404,7 @@ void ReferencesResolver::operator()(yul::VariableDeclaration const& _varDecl)
 			SecondarySourceLocation ssl;
 			for (auto const* decl: declarations)
 				ssl.append("The shadowed declaration is here:", decl->location());
-			if (identifier.name.str() == "blobhash" && !m_evmVersion.hasBlobHash())
-				m_errorReporter.warning(
-					7527_error,
-					nativeLocationOf(identifier),
-					"\"blobhash\" was introduced as builtin function in EVM version Cancun "
-					"but you are currently using EVM version " + m_evmVersion.name() +
-					" and it will not behave as expected for EVM version >= Cancun."
-				);
-			else if (!ssl.infos.empty())
+			if (!ssl.infos.empty())
 				m_errorReporter.declarationError(
 					3859_error,
 					nativeLocationOf(identifier),

libsolidity/interface/CompilerStack.cpp

@@ -469,7 +469,7 @@ bool CompilerStack::analyze()
 			if (source->ast && !syntaxChecker.checkSyntax(*source->ast))
 				noErrors = false;
 
-		m_globalContext = std::make_shared<GlobalContext>();
+		m_globalContext = std::make_shared<GlobalContext>(m_evmVersion);
 		// We need to keep the same resolver during the whole process.
 		NameAndTypeResolver resolver(*m_globalContext, m_evmVersion, m_errorReporter, experimentalSolidity);
 		for (Source const* source: m_sourceOrder)

test/libsolidity/Assembly.cpp

@@ -63,7 +63,7 @@ evmasm::AssemblyItems compileContract(std::shared_ptr<CharStream> _sourceCode)
 
 	Scoper::assignScopes(*sourceUnit);
 	BOOST_REQUIRE(SyntaxChecker(errorReporter, false).checkSyntax(*sourceUnit));
-	GlobalContext globalContext;
+	GlobalContext globalContext(solidity::test::CommonOptions::get().evmVersion());
 	NameAndTypeResolver resolver(globalContext, solidity::test::CommonOptions::get().evmVersion(), errorReporter, false);
 	DeclarationTypeChecker declarationTypeChecker(errorReporter, solidity::test::CommonOptions::get().evmVersion());
 	solAssert(!Error::containsErrors(errorReporter.errors()), "");

test/libsolidity/SolidityExpressionCompiler.cpp

@@ -124,7 +124,7 @@ bytes compileFirstExpression(
 
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
-	GlobalContext globalContext;
+	GlobalContext globalContext(solidity::test::CommonOptions::get().evmVersion());
 	Scoper::assignScopes(*sourceUnit);
 	BOOST_REQUIRE(SyntaxChecker(errorReporter, false).checkSyntax(*sourceUnit));
 	NameAndTypeResolver resolver(globalContext, solidity::test::CommonOptions::get().evmVersion(), errorReporter, false);