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

Add workaround for bytecode/deployedBytecode selection

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-10-19 14:09:40 +01:00
parent 123d85a19e
commit bbcec95bac
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libsolidity/interface/StandardCompiler.cpp
View File

@ -187,6 +187,14 @@ bool isTargetRequired(Json::Value const& _targets, string const& _file, string c
return false; return false;
} }
bool isTargetRequired(Json::Value const& _targets, string const& _file, string const& _contract, vector<string> const& _requested)
{
for (auto const& requested: _requested)
if (isTargetRequired(_targets, _file, _contract, requested))
return true;
return false;
}
Json::Value formatLinkReferences(std::map<size_t, std::string> const& linkReferences) Json::Value formatLinkReferences(std::map<size_t, std::string> const& linkReferences)
{ {
Json::Value ret(Json::objectValue); Json::Value ret(Json::objectValue);
@ -490,13 +498,23 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input)
if (isTargetRequired(outputSelection, file, name, "evm.gasEstimates")) if (isTargetRequired(outputSelection, file, name, "evm.gasEstimates"))
evmData["gasEstimates"] = m_compilerStack.gasEstimates(contractName); evmData["gasEstimates"] = m_compilerStack.gasEstimates(contractName);
if (isTargetRequired(outputSelection, file, name, "evm.bytecode")) if (isTargetRequired(
outputSelection,
file,
name,
{ "evm.bytecode", "evm.bytecode.object", "evm.bytecode.opcodes", "evm.bytecode.sourceMap", "evm.bytecode.linkReferences" }
))
evmData["bytecode"] = collectEVMObject( evmData["bytecode"] = collectEVMObject(
m_compilerStack.object(contractName), m_compilerStack.object(contractName),
m_compilerStack.sourceMapping(contractName) m_compilerStack.sourceMapping(contractName)
); );
if (isTargetRequired(outputSelection, file, name, "evm.deployedBytecode")) if (isTargetRequired(
outputSelection,
file,
name,
{ "evm.deployedBytecode", "evm.deployedBytecode.object", "evm.deployedBytecode.opcodes", "evm.deployedBytecode.sourceMap", "evm.deployedBytecode.linkReferences" }
))
evmData["deployedBytecode"] = collectEVMObject( evmData["deployedBytecode"] = collectEVMObject(
m_compilerStack.runtimeObject(contractName), m_compilerStack.runtimeObject(contractName),
m_compilerStack.runtimeSourceMapping(contractName) m_compilerStack.runtimeSourceMapping(contractName)