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

Merge pull request #4323 from ethereum/compilerstack-cleanup

Browse Source 
Reorder some of the flow in CompilerStack::compileContract for readability
This commit is contained in:
Alex Beregszaszi 2018-06-20 23:01:24 +02:00 committed by GitHub
commit edc0530452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsolidity/interface/CompilerStack.cpp
View File

@ -669,7 +669,7 @@ void CompilerStack::resolveImports()
swap(m_sourceOrder, sourceOrder); swap(m_sourceOrder, sourceOrder);
} }
string CompilerStack::absolutePath(string const& _path, string const& _reference) const string CompilerStack::absolutePath(string const& _path, string const& _reference)
{ {
using path = boost::filesystem::path; using path = boost::filesystem::path;
path p(_path); path p(_path);
@ -711,9 +711,15 @@ void CompilerStack::compileContract(
for (auto const* dependency: _contract.annotation().contractDependencies) for (auto const* dependency: _contract.annotation().contractDependencies)
compileContract(*dependency, _compiledContracts); compileContract(*dependency, _compiledContracts);
shared_ptr<Compiler> compiler = make_shared<Compiler>(m_evmVersion, m_optimize, m_optimizeRuns);
Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName()); Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
shared_ptr<Compiler> compiler = make_shared<Compiler>(m_evmVersion, m_optimize, m_optimizeRuns);
compiledContract.compiler = compiler;
string metadata = createMetadata(compiledContract); string metadata = createMetadata(compiledContract);
compiledContract.metadata = metadata;
// Prepare CBOR metadata for the bytecode
bytes cborEncodedHash = bytes cborEncodedHash =
// CBOR-encoding of the key "bzzr0" // CBOR-encoding of the key "bzzr0"
bytes{0x65, 'b', 'z', 'z', 'r', '0'}+ bytes{0x65, 'b', 'z', 'z', 'r', '0'}+
@ -734,8 +740,9 @@ void CompilerStack::compileContract(
solAssert(cborEncodedMetadata.size() <= 0xffff, "Metadata too large"); solAssert(cborEncodedMetadata.size() <= 0xffff, "Metadata too large");
// 16-bit big endian length // 16-bit big endian length
cborEncodedMetadata += toCompactBigEndian(cborEncodedMetadata.size(), 2); cborEncodedMetadata += toCompactBigEndian(cborEncodedMetadata.size(), 2);
// Run optimiser and compile the contract.
compiler->compileContract(_contract, _compiledContracts, cborEncodedMetadata); compiler->compileContract(_contract, _compiledContracts, cborEncodedMetadata);
compiledContract.compiler = compiler;
try try
{ {
@ -763,7 +770,6 @@ void CompilerStack::compileContract(
solAssert(false, "Assembly exception for deployed bytecode"); solAssert(false, "Assembly exception for deployed bytecode");
} }
compiledContract.metadata = metadata;
_compiledContracts[compiledContract.contract] = &compiler->assembly(); _compiledContracts[compiledContract.contract] = &compiler->assembly();
try try

4
libsolidity/interface/CompilerStack.h
View File

@ -273,9 +273,9 @@ private:
std::string applyRemapping(std::string const& _path, std::string const& _context); std::string applyRemapping(std::string const& _path, std::string const& _context);
void resolveImports(); void resolveImports();
/// @returns the absolute path corresponding to @a _path relative to @a _reference. /// @returns the absolute path corresponding to @a _path relative to @a _reference.
std::string absolutePath(std::string const& _path, std::string const& _reference) const; static std::string absolutePath(std::string const& _path, std::string const& _reference);
/// Helper function to return path converted strings. /// Helper function to return path converted strings.
std::string sanitizePath(std::string const& _path) const { return boost::filesystem::path(_path).generic_string(); } static std::string sanitizePath(std::string const& _path) { return boost::filesystem::path(_path).generic_string(); }
/// @returns true if the contract is requested to be compiled. /// @returns true if the contract is requested to be compiled.
bool isRequestedContract(ContractDefinition const& _contract) const; bool isRequestedContract(ContractDefinition const& _contract) const;