diff options
| author | chriseth <chris@ethereum.org> | 2017-07-31 22:14:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-31 22:14:46 +0800 |
| commit | c2215d4605d1fbcef1366d6b822ec610fc031b3c (patch) | |
| tree | 940ba55f0f27e8884332eaf90c11da48d5e98980 /libsolidity/codegen/CompilerContext.h | |
| parent | 0fb4cb1ab9bb4b6cc72e28cc5a1753ad14781f14 (diff) | |
| parent | 2abfdb65c8dcda6866143280b7ff1bde094a1419 (diff) | |
| download | dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.gz dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.bz2 dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.lz dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.xz dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.zst dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.zip | |
Merge pull request #2667 from ethereum/develop
Merge develop into release in proparation for 0.4.14
Diffstat (limited to 'libsolidity/codegen/CompilerContext.h')
| -rw-r--r-- | libsolidity/codegen/CompilerContext.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libsolidity/codegen/CompilerContext.h b/libsolidity/codegen/CompilerContext.h index 1968c1e1..13821f67 100644 --- a/libsolidity/codegen/CompilerContext.h +++ b/libsolidity/codegen/CompilerContext.h @@ -272,7 +272,10 @@ private: /// Storage offsets of state variables std::map<Declaration const*, std::pair<u256, unsigned>> m_stateVariables; /// Offsets of local variables on the stack (relative to stack base). - std::map<Declaration const*, unsigned> m_localVariables; + /// This needs to be a stack because if a modifier contains a local variable and this + /// modifier is applied twice, the position of the variable needs to be restored + /// after the nested modifier is left. + std::map<Declaration const*, std::vector<unsigned>> m_localVariables; /// List of current inheritance hierarchy from derived to base. std::vector<ContractDefinition const*> m_inheritanceHierarchy; /// Stack of current visited AST nodes, used for location attachment |