cerc-io/solidity
16
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

Rename assemble() to assembleYul() in CompilerStack and CommandLineInterface

Browse Source
This commit is contained in:
Alexander Arlt 2022-11-01 23:58:45 -05:00 committed by Kamil Śliwak
parent ded9ef17e8
commit 611e02c038
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsolidity/interface/CompilerStack.cpp
View File

@ -1284,7 +1284,7 @@ bool onlySafeExperimentalFeaturesActivated(set<ExperimentalFeature> const& featu
} }
} }
void CompilerStack::assemble( void CompilerStack::assembleYul(
ContractDefinition const& _contract, ContractDefinition const& _contract,
shared_ptr<evmasm::Assembly> _assembly, shared_ptr<evmasm::Assembly> _assembly,
shared_ptr<evmasm::Assembly> _runtimeAssembly shared_ptr<evmasm::Assembly> _runtimeAssembly
@ -1397,7 +1397,7 @@ void CompilerStack::compileContract(
_otherCompilers[compiledContract.contract] = compiler; _otherCompilers[compiledContract.contract] = compiler;
assemble(_contract, compiler->assemblyPtr(), compiler->runtimeAssemblyPtr()); assembleYul(_contract, compiler->assemblyPtr(), compiler->runtimeAssemblyPtr());
} }
void CompilerStack::generateIR(ContractDefinition const& _contract) void CompilerStack::generateIR(ContractDefinition const& _contract)
@ -1475,7 +1475,7 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
string deployedName = IRNames::deployedObject(_contract); string deployedName = IRNames::deployedObject(_contract);
solAssert(!deployedName.empty(), ""); solAssert(!deployedName.empty(), "");
tie(compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly) = stack.assembleEVMWithDeployed(deployedName); tie(compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly) = stack.assembleEVMWithDeployed(deployedName);
assemble(_contract, compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly); assembleYul(_contract, compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly);
} }
void CompilerStack::generateEwasm(ContractDefinition const& _contract) void CompilerStack::generateEwasm(ContractDefinition const& _contract)

2
libsolidity/interface/CompilerStack.h
View File

@ -426,7 +426,7 @@ private:
/// Assembles the contract. /// Assembles the contract.
/// This function should only be internally called by compileContract and generateEVMFromIR. /// This function should only be internally called by compileContract and generateEVMFromIR.
void assemble( void assembleYul(
ContractDefinition const& _contract, ContractDefinition const& _contract,
std::shared_ptr<evmasm::Assembly> _assembly, std::shared_ptr<evmasm::Assembly> _assembly,
std::shared_ptr<evmasm::Assembly> _runtimeAssembly std::shared_ptr<evmasm::Assembly> _runtimeAssembly

4
solc/CommandLineInterface.cpp
View File

@ -661,7 +661,7 @@ void CommandLineInterface::processInput()
serveLSP(); serveLSP();
break; break;
case InputMode::Assembler: case InputMode::Assembler:
assemble(m_options.assembly.inputLanguage, m_options.assembly.targetMachine); assembleYul(m_options.assembly.inputLanguage, m_options.assembly.targetMachine);
break; break;
case InputMode::Linker: case InputMode::Linker:
link(); link();
@ -1030,7 +1030,7 @@ string CommandLineInterface::objectWithLinkRefsHex(evmasm::LinkerObject const& _
return out; return out;
} }
void CommandLineInterface::assemble(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine) void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine)
{ {
solAssert(m_options.input.mode == InputMode::Assembler); solAssert(m_options.input.mode == InputMode::Assembler);

2
solc/CommandLineInterface.h
View File

@ -92,7 +92,7 @@ private:
/// @returns the full object with library placeholder hints in hex. /// @returns the full object with library placeholder hints in hex.
static std::string objectWithLinkRefsHex(evmasm::LinkerObject const& _obj); static std::string objectWithLinkRefsHex(evmasm::LinkerObject const& _obj);
void assemble(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine); void assembleYul(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine);
void outputCompilationResults(); void outputCompilationResults();