diff options
| author | Daniel Kirchner <daniel@ekpyron.org> | 2018-04-05 20:43:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 20:43:28 +0800 |
| commit | 037eba20fc6c25777e930d97c1f53f26c6443bb0 (patch) | |
| tree | b2ea415859768ee046f5d8f93ef4741c25f1a19d /libsolidity/codegen | |
| parent | 36d6c27e6826f173b491a7a536a3755609edaa29 (diff) | |
| parent | 96eff0ff6abc614cb44a01137dfd0df1ef750088 (diff) | |
| download | dexon-solidity-037eba20fc6c25777e930d97c1f53f26c6443bb0.tar dexon-solidity-037eba20fc6c25777e930d97c1f53f26c6443bb0.tar.gz dexon-solidity-037eba20fc6c25777e930d97c1f53f26c6443bb0.tar.bz2 dexon-solidity-037eba20fc6c25777e930d97c1f53f26c6443bb0.tar.lz dexon-solidity-037eba20fc6c25777e930d97c1f53f26c6443bb0.tar.xz dexon-solidity-037eba20fc6c25777e930d97c1f53f26c6443bb0.tar.zst dexon-solidity-037eba20fc6c25777e930d97c1f53f26c6443bb0.zip | |
Merge pull request #3824 from ethereum/baseArgumentsEmptyParenthesis
Error when using empty parentheses for base class constructors that r…
Diffstat (limited to 'libsolidity/codegen')
| -rw-r--r-- | libsolidity/codegen/ContractCompiler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp index ebd9139a..d3a7e4ea 100644 --- a/libsolidity/codegen/ContractCompiler.cpp +++ b/libsolidity/codegen/ContractCompiler.cpp @@ -157,8 +157,8 @@ void ContractCompiler::appendInitAndConstructorCode(ContractDefinition const& _c ); solAssert(baseContract, ""); - if (!m_baseArguments.count(baseContract->constructor()) && !base->arguments().empty()) - m_baseArguments[baseContract->constructor()] = &base->arguments(); + if (!m_baseArguments.count(baseContract->constructor()) && base->arguments() && !base->arguments()->empty()) + m_baseArguments[baseContract->constructor()] = base->arguments(); } } // Initialization of state variables in base-to-derived order. |