diff options
| author | chriseth <chris@ethereum.org> | 2016-09-17 21:25:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-17 21:25:54 +0800 |
| commit | af6afb0415761b53721f89c7f65064807f41cbd3 (patch) | |
| tree | 006481ce07f5ed6f1690014921f8c559b71dc5b5 /libsolidity/codegen/ContractCompiler.cpp | |
| parent | 4fc6fc2ca59579fae2472df319c2d8d31fe5bde5 (diff) | |
| parent | a78e7794225da95d0f875c908025213d6a47cb59 (diff) | |
| download | dexon-solidity-af6afb0415761b53721f89c7f65064807f41cbd3.tar dexon-solidity-af6afb0415761b53721f89c7f65064807f41cbd3.tar.gz dexon-solidity-af6afb0415761b53721f89c7f65064807f41cbd3.tar.bz2 dexon-solidity-af6afb0415761b53721f89c7f65064807f41cbd3.tar.lz dexon-solidity-af6afb0415761b53721f89c7f65064807f41cbd3.tar.xz dexon-solidity-af6afb0415761b53721f89c7f65064807f41cbd3.tar.zst dexon-solidity-af6afb0415761b53721f89c7f65064807f41cbd3.zip | |
Merge pull request #1107 from ethereum/develop
Version 0.4.2
Diffstat (limited to 'libsolidity/codegen/ContractCompiler.cpp')
| -rw-r--r-- | libsolidity/codegen/ContractCompiler.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp index 33571bc0..18b42fce 100644 --- a/libsolidity/codegen/ContractCompiler.cpp +++ b/libsolidity/codegen/ContractCompiler.cpp @@ -263,7 +263,9 @@ void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contrac CompilerContext::LocationSetter locationSetter(m_context, functionType->declaration()); m_context << callDataUnpackerEntryPoints.at(it.first); - if (!functionType->isPayable()) + // We have to allow this for libraries, because value of the previous + // call is still visible in the delegatecall. + if (!functionType->isPayable() && !_contract.isLibrary()) { // Throw if function is not payable but call contained ether. m_context << Instruction::CALLVALUE; |