diff options
| author | chriseth <chris@ethereum.org> | 2017-10-17 00:16:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 00:16:40 +0800 |
| commit | 18a72dbe4668e23aaf38404183b978fbbb1824d1 (patch) | |
| tree | 85a20a6872c7b2235c555df22ed186db6a9d52ba /libevmasm | |
| parent | c2fab07ccdf9000023dd9373d9072d44dcdd93d7 (diff) | |
| parent | 082e7b6a9ea5f4651bed0b2ab037dbba05af26eb (diff) | |
| download | dexon-solidity-18a72dbe4668e23aaf38404183b978fbbb1824d1.tar dexon-solidity-18a72dbe4668e23aaf38404183b978fbbb1824d1.tar.gz dexon-solidity-18a72dbe4668e23aaf38404183b978fbbb1824d1.tar.bz2 dexon-solidity-18a72dbe4668e23aaf38404183b978fbbb1824d1.tar.lz dexon-solidity-18a72dbe4668e23aaf38404183b978fbbb1824d1.tar.xz dexon-solidity-18a72dbe4668e23aaf38404183b978fbbb1824d1.tar.zst dexon-solidity-18a72dbe4668e23aaf38404183b978fbbb1824d1.zip | |
Merge pull request #3086 from ethereum/allow_gas_in_view
Allow ``gas`` in view functions.
Diffstat (limited to 'libevmasm')
| -rw-r--r-- | libevmasm/SemanticInformation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp index 83cfe2c6..61a6ccda 100644 --- a/libevmasm/SemanticInformation.cpp +++ b/libevmasm/SemanticInformation.cpp @@ -198,6 +198,7 @@ bool SemanticInformation::invalidInPureFunctions(Instruction _instruction) case Instruction::ORIGIN: case Instruction::CALLER: case Instruction::CALLVALUE: + case Instruction::GAS: case Instruction::GASPRICE: case Instruction::EXTCODESIZE: case Instruction::EXTCODECOPY: @@ -223,7 +224,6 @@ bool SemanticInformation::invalidInViewFunctions(Instruction _instruction) case Instruction::SSTORE: case Instruction::JUMP: case Instruction::JUMPI: - case Instruction::GAS: case Instruction::LOG0: case Instruction::LOG1: case Instruction::LOG2: |