cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Passing eofVersion down

Browse Source
This commit is contained in:
Rodrigo Q. Saramago
2022-12-05 20:17:55 +01:00
parent 7e3404beb0
commit 6a44bb26ae
16 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/codegen/Compiler.h
+3 -3
View File
@@ -37,10 +37,10 @@ namespace solidity::frontend
class Compiler
{
public:
Compiler(langutil::EVMVersion _evmVersion, RevertStrings _revertStrings, OptimiserSettings _optimiserSettings):
Compiler(langutil::EVMVersion _evmVersion, std::optional<uint8_t> _eofVersion, RevertStrings _revertStrings, OptimiserSettings _optimiserSettings):
m_optimiserSettings(std::move(_optimiserSettings)),
m_runtimeContext(_evmVersion, _revertStrings),
m_context(_evmVersion, _revertStrings, &m_runtimeContext)
m_runtimeContext(_evmVersion, _eofVersion, _revertStrings),
m_context(_evmVersion, _eofVersion, _revertStrings, &m_runtimeContext)
{ }
/// Compiles a contract.
libsolidity/codegen/CompilerContext.h
+2 -1
View File
@@ -62,10 +62,11 @@ class CompilerContext
public:
explicit CompilerContext(
langutil::EVMVersion _evmVersion,
std::optional<uint8_t> _eofVersion,
RevertStrings _revertStrings,
CompilerContext* _runtimeContext = nullptr
):
m_asm(std::make_shared<evmasm::Assembly>(_runtimeContext != nullptr, std::string{})),
m_asm(std::make_shared<evmasm::Assembly>(_runtimeContext != nullptr, _eofVersion, std::string{})),
m_evmVersion(_evmVersion),
m_revertStrings(_revertStrings),
m_reservedMemory{0},
libsolidity/interface/CompilerStack.cpp
+1 -1
View File
@@ -1333,7 +1333,7 @@ void CompilerStack::compileContract(
Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
shared_ptr<Compiler> compiler = make_shared<Compiler>(m_evmVersion, m_revertStrings, m_optimiserSettings);
shared_ptr<Compiler> compiler = make_shared<Compiler>(m_evmVersion, m_eofVersion, m_revertStrings, m_optimiserSettings);
compiledContract.compiler = compiler;
solAssert(!m_viaIR, "");